Author: hans
Date: Fri Aug 4 09:52:25 2017
New Revision: 310068
URL: http://llvm.org/viewvc/llvm-project?rev=310068&view=rev
Log:
Merging r309920:
------------------------------------------------------------------------
r309920 | ericwf | 2017-08-02 21:28:10 -0700 (Wed, 02 Aug 2017) | 5 lines
Fix libcxx build with glibc 2.26+ by removing xlocale.h include.
Patch by Khem Raj. Reviewed as D35697. Also see PR33729.
------------------------------------------------------------------------
Modified:
libcxx/branches/release_50/ (props changed)
libcxx/branches/release_50/include/__locale
Propchange: libcxx/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 4 09:52:25 2017
@@ -1,2 +1,2 @@
/libcxx/branches/apple:136569-137939
-/libcxx/trunk:309917
+/libcxx/trunk:309917,309920
Modified: libcxx/branches/release_50/include/__locale
URL:
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_50/include/__locale?rev=310068&r1=310067&r2=310068&view=diff
==============================================================================
--- libcxx/branches/release_50/include/__locale (original)
+++ libcxx/branches/release_50/include/__locale Fri Aug 4 09:52:25 2017
@@ -34,7 +34,7 @@
# include <support/solaris/xlocale.h>
#elif defined(_NEWLIB_VERSION)
# include <support/newlib/xlocale.h>
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
# include <xlocale.h>
#elif defined(__Fuchsia__)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
