commit 4b1bdae3955769f62e563e826065d10ddfe040ea
author Nicolas Capens <capn@google.com> Fri Jan 06 18:19:17 2017 -0500
committer Jim Stichnoth <stichnot@chromium.org> Sat Jan 07 06:40:10 2017 +0000
tree fb46e6bc84a8b6a474595b4ab44fdb6031977beb
parent f2c91aa563c9ec867e88e633ecda66c01380c9ae

Fix Mac OS compilation.

Change-Id: I140c17b1b48156ae5dd5ca6cf4ef41f3bc03f16a
Reviewed-on: https://chromium-review.googlesource.com/425780
Reviewed-by: Jim Stichnoth <stichnot@chromium.org>

src/IceInstX8664.def

diff --git a/src/IceInstX8664.def b/src/IceInstX8664.def
index 135f106..5b8f121 100644
--- a/src/IceInstX8664.def
+++ b/src/IceInstX8664.def
@@ -214,11 +214,9 @@
 #if defined(_WIN32) && defined(SUBZERO_USE_MICROSOFT_ABI)  // Microsoft x86-64 ABI
 #define REGX8664_BYTEREG_TABLE REGX8664_BYTEREG_TABLE2(0, 1)
 #define REGX8664_GPR_TABLE REGX8664_GPR_TABLE2(0, 1)
-#elif defined(__unix__)  // System V AMD64 ABI
+#else  // System V AMD64 ABI
 #define REGX8664_BYTEREG_TABLE REGX8664_BYTEREG_TABLE2(1, 0)
 #define REGX8664_GPR_TABLE REGX8664_GPR_TABLE2(1, 0)
-#else
-#error "Unsupported platform"
 #endif
 
 // Note: It would be more appropriate to list the xmm register aliases as

src/IceTargetLoweringX8664Traits.h

diff --git a/src/IceTargetLoweringX8664Traits.h b/src/IceTargetLoweringX8664Traits.h
index b427dd3..d0f1d91 100644
--- a/src/IceTargetLoweringX8664Traits.h
+++ b/src/IceTargetLoweringX8664Traits.h
@@ -730,7 +730,7 @@
     assert(Ty == IceType_i64 || Ty == IceType_i32);
     return getGprForType(Ty, GprForArgNum[ArgNum]);
   }
-#elif defined(__unix__)
+#else
   // System V x86-64 calling convention:
   //
   // * The first eight arguments of vector/fp type, regardless of their
@@ -762,8 +762,6 @@
     assert(Ty == IceType_i64 || Ty == IceType_i32);
     return getGprForType(Ty, GprForArgNum[ArgNum]);
   }
-#else
-#error "Unsupported platform"
 #endif
 
   /// Whether scalar floating point arguments are passed in XMM registers