From 843517d2d82bcc0736c9f96f847935666c875e6c Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Fri, 5 Sep 2014 08:18:53 +0000 Subject: [PATCH] clang/test/CXX/drs/dr5xx.cpp: Fix up assumption of thiscall. It affects not x64 but x86. Note, i686-cygwin doesn't use thiscall. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@217234 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CXX/drs/dr5xx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/CXX/drs/dr5xx.cpp b/test/CXX/drs/dr5xx.cpp index 9ff67f88cc..73f1a26b58 100644 --- a/test/CXX/drs/dr5xx.cpp +++ b/test/CXX/drs/dr5xx.cpp @@ -518,10 +518,10 @@ namespace dr546 { // dr546: yes } namespace dr547 { // dr547: yes - // When targeting the MS ABI, the type of a member function includes a + // When targeting the MS x86 ABI, the type of a member function includes a // __thiscall qualifier. This is non-conforming, but we still implement // the intent of dr547 -#if defined(_M_IX86) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(_M_IX86) || (defined(__MINGW32__) && !defined(__MINGW64__)) #define THISCALL __thiscall #else #define THISCALL -- 2.40.0