Skip to content

Commit 6536a67

Browse files
committed
[Linux] Revert 1e56821
The glibc issue mentioned in #47994 has been fixed upstream.
1 parent a72d8d7 commit 6536a67

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

clang/lib/Basic/Targets/OSTargets.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,9 +387,6 @@ class LLVM_LIBRARY_VISIBILITY LinuxTargetInfo : public OSTargetInfo<Target> {
387387
} else {
388388
Builder.defineMacro("__gnu_linux__");
389389
}
390-
// Work around Issue #47994 until glibc PR build/27558 is fixed.
391-
if (Triple.isSPARC())
392-
Builder.defineMacro("__NO_INLINE__");
393390
if (Opts.POSIXThreads)
394391
Builder.defineMacro("_REENTRANT");
395392
if (Opts.CPlusPlus)

clang/test/Preprocessor/init.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -874,9 +874,6 @@
874874

875875
// 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
876876
// 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
877-
// Check that clang defines __NO_INLINE__ unconditionally (even at -O) to
878-
// work around Issue #47994.
879-
// RUN: %clang_cc1 -E -dM -triple=sparc-unknown-linux-gnu -O < /dev/null | FileCheck -match-full-lines -check-prefix SPARC-LINUX %s
880877
// 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
881878
// 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
882879
//
@@ -1000,7 +997,6 @@
1000997
// SPARC:#define __LONG_LONG_MAX__ 9223372036854775807LL
1001998
// SPARC:#define __LONG_MAX__ 2147483647L
1002999
// SPARC-NOT:#define __LP64__
1003-
// SPARC-LINUX:#define __NO_INLINE__ 1
10041000
// SPARC:#define __POINTER_WIDTH__ 32
10051001
// SPARC-DEFAULT:#define __PTRDIFF_TYPE__ int
10061002
// SPARC-NETOPENBSD:#define __PTRDIFF_TYPE__ long int
@@ -1387,11 +1383,6 @@
13871383
// SPARCV9:#define __SIZEOF_POINTER__ 8
13881384
// SPARCV9:#define __UINTPTR_TYPE__ long unsigned int
13891385
//
1390-
// Check that clang defines __NO_INLINE__ unconditionally (even at -O) to
1391-
// work around Issue #47994.
1392-
// RUN: %clang_cc1 -E -dM -triple=sparc64-unknown-linux-gnu -O < /dev/null | FileCheck -match-full-lines -check-prefix SPARC64-LINUX %s
1393-
// SPARC64-LINUX:#define __NO_INLINE__ 1
1394-
//
13951386
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc64-none-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC64-OBSD %s
13961387
// SPARC64-OBSD:#define __INT64_TYPE__ long long int
13971388
// SPARC64-OBSD:#define __INTMAX_C_SUFFIX__ LL

0 commit comments

Comments
 (0)