[PATCH] MinGW: Define __stdcall&co when -fms-extensions is disabled

[Richard Smith]

You don't seem to have any tests for the calling convention macros?
On 21 Apr 2014 13:50, "Reid Kleckner" <rnk at google.com> wrote:

> Hi majnemer, asl,
>
> This is for compatibility with GCC.
>
> http://reviews.llvm.org/D3444
>
> Files:
>   lib/Basic/Targets.cpp
>   test/SemaCXX/decl-microsoft-call-conv.cpp
>
> Index: lib/Basic/Targets.cpp
> ===================================================================
> --- lib/Basic/Targets.cpp
> +++ lib/Basic/Targets.cpp
> @@ -3085,6 +3085,31 @@
>  };
>  } // end anonymous namespace
>
> +static void addMinGWDefines(const LangOptions &Opts, MacroBuilder
> &Builder) {
> +  Builder.defineMacro("__MSVCRT__");
> +  Builder.defineMacro("__MINGW32__");
> +
> +  // Mingw defines __declspec(a) to __attribute__((a)).  Clang supports
> +  // __declspec natively under -fms-extensions, but we define a no-op
> __declspec
> +  // macro anyway for pre-processor compatibility.
> +  if (Opts.MicrosoftExt)
> +    Builder.defineMacro("__declspec", "__declspec");
> +  else
> +    Builder.defineMacro("__declspec(a)", "__attribute__((a))");
> +
> +  if (!Opts.MicrosoftExt) {
> +    // Provide macros for all the calling convention keywords.  Provide
> both
> +    // single and double underscore prefixed variants.  These are
> available on
> +    // x64 as well as x86, even though they have no effect.
> +    const char *CCs[] = {"cdecl", "stdcall", "fastcall", "thiscall",
> "pascal"};
> +    for (const char *CC : CCs) {
> +      Twine GCCSpelling = Twine("__attribute__((__") + CC + Twine("__))");
> +      Builder.defineMacro(Twine("_") + CC, GCCSpelling);
> +      Builder.defineMacro(Twine("__") + CC, GCCSpelling);
> +    }
> +  }
> +}
> +
>  namespace {
>  // x86-32 MinGW target
>  class MinGWX86_32TargetInfo : public WindowsX86_32TargetInfo {
> @@ -3097,17 +3122,7 @@
>      DefineStd(Builder, "WIN32", Opts);
>      DefineStd(Builder, "WINNT", Opts);
>      Builder.defineMacro("_X86_");
> -    Builder.defineMacro("__MSVCRT__");
> -    Builder.defineMacro("__MINGW32__");
> -
> -    // mingw32-gcc provides __declspec(a) as alias of __attribute__((a)).
> -    // In contrast, clang-cc1 provides __declspec(a) with -fms-extensions.
> -    if (Opts.MicrosoftExt)
> -      // Provide "as-is" __declspec.
> -      Builder.defineMacro("__declspec", "__declspec");
> -    else
> -      // Provide alias of __attribute__ like mingw32-gcc.
> -      Builder.defineMacro("__declspec(a)", "__attribute__((a))");
> +    addMinGWDefines(Opts, Builder);
>    }
>  };
>  } // end anonymous namespace
> @@ -3327,18 +3342,8 @@
>                          MacroBuilder &Builder) const override {
>      WindowsX86_64TargetInfo::getTargetDefines(Opts, Builder);
>      DefineStd(Builder, "WIN64", Opts);
> -    Builder.defineMacro("__MSVCRT__");
> -    Builder.defineMacro("__MINGW32__");
>      Builder.defineMacro("__MINGW64__");
> -
> -    // mingw32-gcc provides __declspec(a) as alias of __attribute__((a)).
> -    // In contrast, clang-cc1 provides __declspec(a) with -fms-extensions.
> -    if (Opts.MicrosoftExt)
> -      // Provide "as-is" __declspec.
> -      Builder.defineMacro("__declspec", "__declspec");
> -    else
> -      // Provide alias of __attribute__ like mingw32-gcc.
> -      Builder.defineMacro("__declspec(a)", "__attribute__((a))");
> +    addMinGWDefines(Opts, Builder);
>    }
>  };
>  } // end anonymous namespace
> Index: test/SemaCXX/decl-microsoft-call-conv.cpp
> ===================================================================
> --- test/SemaCXX/decl-microsoft-call-conv.cpp
> +++ test/SemaCXX/decl-microsoft-call-conv.cpp
> @@ -1,4 +1,6 @@
>  // RUN: %clang_cc1 -triple i686-pc-win32 -fms-extensions -verify %s
> +// RUN: %clang_cc1 -triple i686-pc-mingw32 -verify %s
> +// RUN: %clang_cc1 -triple i686-pc-mingw32 -fms-extensions -verify %s
>
>  typedef void void_fun_t();
>  typedef void __cdecl cdecl_fun_t();
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140421/b4825dda/attachment.html>