Author: Brad Smith Date: 2022-11-17T19:48:01-05:00 New Revision: 6536a67338fceece914746d3f654e5f2e881f73b
URL: https://github.com/llvm/llvm-project/commit/6536a67338fceece914746d3f654e5f2e881f73b DIFF: https://github.com/llvm/llvm-project/commit/6536a67338fceece914746d3f654e5f2e881f73b.diff LOG: [Linux] Revert 1e56821bac02a5d3c6249bbf3ef43b8b569d2551 The glibc issue mentioned in #47994 has been fixed upstream. Added: Modified: clang/lib/Basic/Targets/OSTargets.h clang/test/Preprocessor/init.c Removed: ################################################################################ diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h index 5f5b461043b41..a1b1f917931b2 100644 --- a/clang/lib/Basic/Targets/OSTargets.h +++ b/clang/lib/Basic/Targets/OSTargets.h @@ -387,9 +387,6 @@ class LLVM_LIBRARY_VISIBILITY LinuxTargetInfo : public OSTargetInfo<Target> { } else { Builder.defineMacro("__gnu_linux__"); } - // Work around Issue #47994 until glibc PR build/27558 is fixed. - if (Triple.isSPARC()) - Builder.defineMacro("__NO_INLINE__"); if (Opts.POSIXThreads) Builder.defineMacro("_REENTRANT"); if (Opts.CPlusPlus) diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c index ee6976b625b97..312723acf598a 100644 --- a/clang/test/Preprocessor/init.c +++ b/clang/test/Preprocessor/init.c @@ -874,9 +874,6 @@ // RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-none-none < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT %s // RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-rtems-elf < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT %s -// Check that clang defines __NO_INLINE__ unconditionally (even at -O) to -// work around Issue #47994. -// RUN: %clang_cc1 -E -dM -triple=sparc-unknown-linux-gnu -O < /dev/null | FileCheck -match-full-lines -check-prefix SPARC-LINUX %s // RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-none-netbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-NETOPENBSD %s // RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-none-none < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT -check-prefix SPARC-DEFAULT-CXX %s // @@ -1000,7 +997,6 @@ // SPARC:#define __LONG_LONG_MAX__ 9223372036854775807LL // SPARC:#define __LONG_MAX__ 2147483647L // SPARC-NOT:#define __LP64__ -// SPARC-LINUX:#define __NO_INLINE__ 1 // SPARC:#define __POINTER_WIDTH__ 32 // SPARC-DEFAULT:#define __PTRDIFF_TYPE__ int // SPARC-NETOPENBSD:#define __PTRDIFF_TYPE__ long int @@ -1387,11 +1383,6 @@ // SPARCV9:#define __SIZEOF_POINTER__ 8 // SPARCV9:#define __UINTPTR_TYPE__ long unsigned int // -// Check that clang defines __NO_INLINE__ unconditionally (even at -O) to -// work around Issue #47994. -// RUN: %clang_cc1 -E -dM -triple=sparc64-unknown-linux-gnu -O < /dev/null | FileCheck -match-full-lines -check-prefix SPARC64-LINUX %s -// SPARC64-LINUX:#define __NO_INLINE__ 1 -// // RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc64-none-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC64-OBSD %s // SPARC64-OBSD:#define __INT64_TYPE__ long long int // SPARC64-OBSD:#define __INTMAX_C_SUFFIX__ LL _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits