Merged to 6.0 in r322539.
On Mon, Jan 15, 2018 at 10:16 PM, Erich Keane via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: erichkeane > Date: Mon Jan 15 13:16:25 2018 > New Revision: 322518 > > URL: http://llvm.org/viewvc/llvm-project?rev=322518&view=rev > Log: > Revert 319303: Add _Float128 as alias to __float128 to enable compilations on > Fedora27/glibc2 > > Differential Revision: https://reviews.llvm.org/D40673 > > Removed: > cfe/trunk/test/Sema/_Float128.c > Modified: > cfe/trunk/include/clang/Basic/TokenKinds.def > cfe/trunk/lib/Frontend/InitPreprocessor.cpp > cfe/trunk/test/Preprocessor/cuda-types.cu > > Modified: cfe/trunk/include/clang/Basic/TokenKinds.def > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TokenKinds.def?rev=322518&r1=322517&r2=322518&view=diff > ============================================================================== > --- cfe/trunk/include/clang/Basic/TokenKinds.def (original) > +++ cfe/trunk/include/clang/Basic/TokenKinds.def Mon Jan 15 13:16:25 2018 > @@ -398,7 +398,6 @@ TYPE_TRAIT_2(__builtin_types_compatible_ > KEYWORD(__builtin_va_arg , KEYALL) > KEYWORD(__extension__ , KEYALL) > KEYWORD(__float128 , KEYALL) > -ALIAS("_Float128", __float128 , KEYNOCXX) > KEYWORD(__imag , KEYALL) > KEYWORD(__int128 , KEYALL) > KEYWORD(__label__ , KEYALL) > > Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=322518&r1=322517&r2=322518&view=diff > ============================================================================== > --- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original) > +++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Mon Jan 15 13:16:25 2018 > @@ -817,10 +817,6 @@ static void InitializePredefinedMacros(c > DefineFloatMacros(Builder, "FLT", &TI.getFloatFormat(), "F"); > DefineFloatMacros(Builder, "DBL", &TI.getDoubleFormat(), ""); > DefineFloatMacros(Builder, "LDBL", &TI.getLongDoubleFormat(), "L"); > - if (TI.hasFloat128Type()) > - // FIXME: Switch away from the non-standard "Q" when we can > - DefineFloatMacros(Builder, "FLT128", &TI.getFloat128Format(), "Q"); > - > > // Define a __POINTER_WIDTH__ macro for stdint.h. > Builder.defineMacro("__POINTER_WIDTH__", > > Modified: cfe/trunk/test/Preprocessor/cuda-types.cu > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/cuda-types.cu?rev=322518&r1=322517&r2=322518&view=diff > ============================================================================== > --- cfe/trunk/test/Preprocessor/cuda-types.cu (original) > +++ cfe/trunk/test/Preprocessor/cuda-types.cu Mon Jan 15 13:16:25 2018 > @@ -9,40 +9,40 @@ > > // RUN: %clang --cuda-host-only -nocudainc -target i386-unknown-linux-gnu -x > cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/i386-host-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/i386-host-defines-filtered > // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target > i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/i386-device-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/i386-device-defines-filtered > // RUN: diff %t/i386-host-defines-filtered %t/i386-device-defines-filtered > > // RUN: %clang --cuda-host-only -nocudainc -target x86_64-unknown-linux-gnu > -x cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/x86_64-host-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/x86_64-host-defines-filtered > // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target > x86_64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/x86_64-device-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > > %t/x86_64-device-defines-filtered > // RUN: diff %t/x86_64-host-defines-filtered > %t/x86_64-device-defines-filtered > > // RUN: %clang --cuda-host-only -nocudainc -target > powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/powerpc64-host-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > > %t/powerpc64-host-defines-filtered > // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target > powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/powerpc64-device-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > > %t/powerpc64-device-defines-filtered > // RUN: diff %t/powerpc64-host-defines-filtered > %t/powerpc64-device-defines-filtered > > // RUN: %clang --cuda-host-only -nocudainc -target i386-windows-msvc -x cuda > -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/i386-msvc-host-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > > %t/i386-msvc-host-defines-filtered > // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target > i386-windows-msvc -x cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/i386-msvc-device-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > > %t/i386-msvc-device-defines-filtered > // RUN: diff %t/i386-msvc-host-defines-filtered > %t/i386-msvc-device-defines-filtered > > // RUN: %clang --cuda-host-only -nocudainc -target x86_64-windows-msvc -x > cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/x86_64-msvc-host-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > > %t/x86_64-msvc-host-defines-filtered > // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target > x86_64-windows-msvc -x cuda -E -dM -o - /dev/null \ > // RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define > __GCC_ATOMIC' \ > -// RUN: | grep -v '__FLT128\|__LDBL\|_LONG_DOUBLE' > > %t/x86_64-msvc-device-defines-filtered > +// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > > %t/x86_64-msvc-device-defines-filtered > // RUN: diff %t/x86_64-msvc-host-defines-filtered > %t/x86_64-msvc-device-defines-filtered > > Removed: cfe/trunk/test/Sema/_Float128.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/_Float128.c?rev=322517&view=auto > ============================================================================== > --- cfe/trunk/test/Sema/_Float128.c (original) > +++ cfe/trunk/test/Sema/_Float128.c (removed) > @@ -1,22 +0,0 @@ > -// RUN: %clang_cc1 -verify %s > -// RUN: %clang_cc1 -triple powerpc64-linux -verify %s > -// RUN: %clang_cc1 -triple i686-windows-gnu -verify %s > -// RUN: %clang_cc1 -triple x86_64-windows-gnu -verify %s > -// RUN: %clang_cc1 -triple x86_64-windows-msvc -verify %s > - > -#if defined(__FLOAT128__) || defined(__SIZEOF_FLOAT128__) > -_Float128 f; > -_Float128 tiny = __FLT128_EPSILON__; > -int g(int x, _Float128 *y) { > - return x + *y; > -} > - > -// expected-no-diagnostics > -#else > -_Float128 f; // expected-error {{__float128 is not supported on this > target}} > -float tiny = __FLT128_EPSILON__; // expected-error{{use of undeclared > identifier}} > -int g(int x, _Float128 *y) { // expected-error {{__float128 is not > supported on this target}} > - return x + *y; > -} > - > -#endif // defined(__FLOAT128__) || defined(__SIZEOF_FLOAT128__) > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits