aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2017-03-28 13:04:18 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2017-04-06 22:48:02 +0100
commit205b3757236538977aeef663c63ba4c4ec7ffbe0 (patch)
treeab3462d7b55b8288d86fd6d4b63202ee0550e5e3
parent3194ab9420de8a593229d28e3a66ed6b0e4a8061 (diff)
downloadmeson-205b3757236538977aeef663c63ba4c4ec7ffbe0.zip
meson-205b3757236538977aeef663c63ba4c4ec7ffbe0.tar.gz
meson-205b3757236538977aeef663c63ba4c4ec7ffbe0.tar.bz2
Cygwin uses the msabi calling convention on x86_64
Fix test cases/common/126 and 135 on Cygwin/x86_64 Cygwin also uses the msabi calling convention on x86_64, not the sysvabi calling convention.
-rw-r--r--test cases/common/126 llvm ir and assembly/square-x86_64.S4
-rw-r--r--test cases/common/135 generated assembly/square-x86_64.S.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/test cases/common/126 llvm ir and assembly/square-x86_64.S b/test cases/common/126 llvm ir and assembly/square-x86_64.S
index 4adc31e..1452f47 100644
--- a/test cases/common/126 llvm ir and assembly/square-x86_64.S
+++ b/test cases/common/126 llvm ir and assembly/square-x86_64.S
@@ -19,12 +19,12 @@ END
.text
.globl SYMBOL_NAME(square_unsigned)
-# ifdef _WIN32 /* MinGW */
+# if defined(_WIN32) || defined(__CYGWIN__) /* msabi */
SYMBOL_NAME(square_unsigned):
imull %ecx, %ecx
movl %ecx, %eax
retq
-# else /* Linux and OS X */
+# else /* sysvabi */
SYMBOL_NAME(square_unsigned):
imull %edi, %edi
movl %edi, %eax
diff --git a/test cases/common/135 generated assembly/square-x86_64.S.in b/test cases/common/135 generated assembly/square-x86_64.S.in
index b6d7fb0..0834f16 100644
--- a/test cases/common/135 generated assembly/square-x86_64.S.in
+++ b/test cases/common/135 generated assembly/square-x86_64.S.in
@@ -23,12 +23,12 @@ END
.type square_unsigned,@function
# endif
-# ifdef _WIN32 /* MinGW */
+# if defined(_WIN32) || defined(__CYGWIN__) /* msabi */
SYMBOL_NAME(square_unsigned):
imull %ecx, %ecx
movl %ecx, %eax
retq
-# else /* Linux and OS X */
+# else /* sysvabi */
SYMBOL_NAME(square_unsigned):
imull %edi, %edi
movl %edi, %eax