Fix inadvertent use of the Microsoft x86-64 calling convention.

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

Fix inadvertent use of the Microsoft x86-64 calling convention.
f2c91aa5 · Nicolas Capens · Jim Stichnoth · c78be4ec · f2c91aa5 · f2c91aa5
Commit f2c91aa5 authored Jan 06, 2017 by Nicolas Capens Committed by Jim Stichnoth Jan 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

IceInstX8664.def src/IceInstX8664.def +1 -1

IceTargetLoweringX8664Traits.h src/IceTargetLoweringX8664Traits.h +1 -1

No files found.
--- a/src/IceInstX8664.def
+++ b/src/IceInstX8664.def
@@ -211,7 +211,7 @@
 //          sboxres, isGPR, is64, is32, is16, is8, isXmm, is64To8, is32To8,
 //          is16To8, isTrunc8Rcvr, isAhRcvr, aliases)

-#if defined(_WIN32)  // Microsoft x86-64 ABI
+#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

--- a/src/IceTargetLoweringX8664Traits.h
+++ b/src/IceTargetLoweringX8664Traits.h
@@ -702,7 +702,7 @@ public:

  static RegNumT getRdxOrDie() { return RegisterSet::Reg_rdx; }

-#if defined(_WIN32)
+#if defined(_WIN32) && defined(SUBZERO_USE_MICROSOFT_ABI)
  // Microsoft x86-64 calling convention:
  //
  // * The first four arguments of vector/fp type, regardless of their