[llvm-branch-commits] [cfe-branch] r155573 - in /cfe/branches/release_31: ./ lib/Basic/Targets.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Wed Apr 25 13:26:22 2012
New Revision: 155573

URL: http://llvm.org/viewvc/llvm-project?rev=155573&view=rev
Log:
Merging r155535:
------------------------------------------------------------------------
r155535 | lattner | 2012-04-24 23:12:24 -0700 (Tue, 24 Apr 2012) | 5 lines

OpenBSD: Remove incorrect -pthread preprocessor define _POSIX_THREADS and replace
with _REENTRANT. Also remove undef _POSIX_THREADS in phread.h.

Patch by Brad Smith!

------------------------------------------------------------------------

Modified:
    cfe/branches/release_31/   (props changed)
    cfe/branches/release_31/lib/Basic/Targets.cpp
    cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 25 13:26:22 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:155076,155279,155342,155534
+/cfe/trunk:155076,155279,155342,155534-155535
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_31/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_31/lib/Basic/Targets.cpp?rev=155573&r1=155572&r2=155573&view=diff
==============================================================================
--- cfe/branches/release_31/lib/Basic/Targets.cpp (original)
+++ cfe/branches/release_31/lib/Basic/Targets.cpp Wed Apr 25 13:26:22 2012
@@ -365,7 +365,7 @@
     DefineStd(Builder, "unix", Opts);
     Builder.defineMacro("__ELF__");
     if (Opts.POSIXThreads)
-      Builder.defineMacro("_POSIX_THREADS");
+      Builder.defineMacro("_REENTRANT");
   }
 public:
   OpenBSDTargetInfo(const std::string &triple)

Propchange: cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 25 13:26:22 2012
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155279,155342,155534
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155279,155342,155534-155535