diff options
| author | Reid Kleckner <rnk@google.com> | 2017-05-26 17:38:15 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2017-05-26 17:38:15 +0000 |
| commit | 9eabbb6066292b9df7aa3eb33527148a161019f3 (patch) | |
| tree | edac8bc08c7a86d40bd483129792cd8730a9b56e | |
| parent | 1f9cab6b1c7746479b90f0d0bebfa38bef2e2f43 (diff) | |
| download | bcm5719-llvm-9eabbb6066292b9df7aa3eb33527148a161019f3.tar.gz bcm5719-llvm-9eabbb6066292b9df7aa3eb33527148a161019f3.zip | |
Enable __float128 for mingw for GCC compatibility and define __SIZEOF_FLOAT128__ on x86
GCC defines __FLOAT128__ on Power and __SIZEOF_FLOAT128__ on x86. We're
just following the inconsistency for now so users have some way to test.
Effectively merges this patch as requested by Martell Malone:
https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-clang/0107-enable-__float128-for-X86-MinGW.patch
llvm-svn: 304012
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Sema/128bitfloat.cpp | 10 |
3 files changed, 13 insertions, 4 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index b35033876da..636be1f92c7 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -4644,7 +4644,9 @@ static void addMinGWDefines(const LangOptions &Opts, MacroBuilder &Builder) { class MinGWX86_32TargetInfo : public WindowsX86_32TargetInfo { public: MinGWX86_32TargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) - : WindowsX86_32TargetInfo(Triple, Opts) {} + : WindowsX86_32TargetInfo(Triple, Opts) { + HasFloat128 = true; + } void getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const override { WindowsX86_32TargetInfo::getTargetDefines(Opts, Builder); @@ -4936,6 +4938,7 @@ public: // with x86 FP ops. Weird. LongDoubleWidth = LongDoubleAlign = 128; LongDoubleFormat = &llvm::APFloat::x87DoubleExtended(); + HasFloat128 = true; } void getTargetDefines(const LangOptions &Opts, diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index 08befb33c96..fb788c43a2f 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -750,6 +750,8 @@ static void InitializePredefinedMacros(const TargetInfo &TI, TI.getTypeWidth(TI.getWIntType()), TI, Builder); if (TI.hasInt128Type()) DefineTypeSizeof("__SIZEOF_INT128__", 128, TI, Builder); + if (TI.hasFloat128Type()) + DefineTypeSizeof("__SIZEOF_FLOAT128__", 128, TI, Builder); DefineType("__INTMAX_TYPE__", TI.getIntMaxType(), Builder); DefineFmt("__INTMAX", TI.getIntMaxType(), TI, Builder); diff --git a/clang/test/Sema/128bitfloat.cpp b/clang/test/Sema/128bitfloat.cpp index 2449cb6b659..4a826b479d0 100644 --- a/clang/test/Sema/128bitfloat.cpp +++ b/clang/test/Sema/128bitfloat.cpp @@ -1,7 +1,11 @@ -// RUN: %clang_cc1 -fsyntax-only -verify -std=gnu++11 %s -// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s +// RUN: %clang_cc1 -verify -std=gnu++11 %s +// RUN: %clang_cc1 -verify -std=c++11 %s +// RUN: %clang_cc1 -triple powerpc64-linux -verify -std=c++11 %s +// RUN: %clang_cc1 -triple i686-windows-gnu -verify -std=c++11 %s +// RUN: %clang_cc1 -triple x86_64-windows-gnu -verify -std=c++11 %s +// RUN: %clang_cc1 -triple x86_64-windows-msvc -verify -std=c++11 %s -#ifdef __FLOAT128__ +#if defined(__FLOAT128__) || defined(__SIZEOF_FLOAT128__) __float128 f; template<typename> struct __is_floating_point_helper {}; template<> struct __is_floating_point_helper<__float128> {}; |
