From 8ebd0ffeb644635b25bf52e40d021ee807c92f33 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Thu, 19 Jan 2017 00:10:50 +0000 Subject: Merging r292119: ------------------------------------------------------------------------ r292119 | joerg | 2017-01-16 15:07:24 +0100 (Mo, 16. Jan 2017) | 3 Zeilen Ensure that clang -pthread creates the right macro. -D_POSIX_THREADS seems to have been a C&P error from old GCC specs for OpenBSD. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@292451 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/Targets.cpp | 2 +- test/Driver/netbsd.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 89e3f3ebbe..1a95ff2681 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -512,7 +512,7 @@ protected: Builder.defineMacro("__unix__"); Builder.defineMacro("__ELF__"); if (Opts.POSIXThreads) - Builder.defineMacro("_POSIX_THREADS"); + Builder.defineMacro("_REENTRANT"); switch (Triple.getArch()) { default: diff --git a/test/Driver/netbsd.c b/test/Driver/netbsd.c index 5558a80b98..06b5eadfca 100644 --- a/test/Driver/netbsd.c +++ b/test/Driver/netbsd.c @@ -126,6 +126,8 @@ // RUN: %clang -no-canonical-prefixes -target powerpc64--netbsd -static \ // RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \ // RUN: | FileCheck -check-prefix=S-POWERPC64 %s +// RUN: %clang -target x86_64--netbsd -pthread -dM -E %s \ +// RUN: | FileCheck -check-prefix=PTHREAD %s // STATIC: ld{{.*}}" "--eh-frame-hdr" // STATIC-NOT: "-pie" @@ -427,3 +429,7 @@ // S-POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crti.o" // S-POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc" // S-POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o" + +// PTHREAD-NOT: _POSIX_THREADS +// PTHREAD: _REENTRANT +// PTHREAD-NOT: _POSIX_THREADS -- cgit v1.2.3