From 205b3757236538977aeef663c63ba4c4ec7ffbe0 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 28 Mar 2017 13:04:18 +0100 Subject: [PATCH] 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. --- test cases/common/126 llvm ir and assembly/square-x86_64.S | 4 ++-- test cases/common/135 generated assembly/square-x86_64.S.in | 4 ++-- 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 4adc31e14..1452f476e 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 b6d7fb002..0834f1662 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