summaryrefslogtreecommitdiffstats
path: root/lib/libc++
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-03-05 19:30:36 +0000
committerdim <dim@FreeBSD.org>2014-03-05 19:30:36 +0000
commit22ca1336dcfb663d86a6892dbe1e48eee20bb6db (patch)
tree72f4bceef54682e8e577b4ddd08c0ad24ea08ff6 /lib/libc++
parenta5552de0b34d11a40bdc1d8e53fa44a923b6b1a8 (diff)
downloadFreeBSD-src-22ca1336dcfb663d86a6892dbe1e48eee20bb6db.zip
FreeBSD-src-22ca1336dcfb663d86a6892dbe1e48eee20bb6db.tar.gz
MFC r261283:
Import libc++ 3.4 release. This contains a lot of bugfixes, and some preliminary support for C++1y. MFC r261604: HEAD is not buildable for the past day. Commit a 'quick fix' in order to permit buildworld to complete. Reviewed by: theraven MFC r261608: Apply a cleaner solution for the sign warnings that can occur when compiling libc++'s <locale> header with -Wsystem-headers on. This has also been submitted upstream. Reported by: asomers MFC r261801: An ABI incompatibility crept into the libc++ 3.4 import in r261283. It was caused by upstream libc++ commit r194536, which aimed to make the headers more standards-compliant, by making std::pair's copy constructor trivial. Unfortunately, this could cause certain C++ applications using shared libraries built against the previous version of libc++ to crash. Fix the ABI incompatibility by making std::pair's copy constructor non-trivial again. Please note: Any C++ applications or shared libraries built with libc++ between r261283 and this revision should be recompiled. Reported by: stefanf
Diffstat (limited to 'lib/libc++')
-rw-r--r--lib/libc++/Makefile13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 567144a..1e7dfaf 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -25,8 +25,10 @@ SRCS+= algorithm.cpp\
memory.cpp\
mutex.cpp\
new.cpp\
+ optional.cpp\
random.cpp\
regex.cpp\
+ shared_mutex.cpp\
stdexcept.cpp\
string.cpp\
strstream.cpp\
@@ -61,7 +63,7 @@ CXXFLAGS+= -std=c++0x
DPADD= ${LIBCXXRT}
LDADD= -lcxxrt
LDFLAGS+= --verbose
-INCSGROUPS= STD EXT
+INCSGROUPS= STD EXP EXT
STD_HEADERS= __bit_reference\
__config\
@@ -140,6 +142,7 @@ STD_HEADERS= __bit_reference\
regex\
scoped_allocator\
set\
+ shared_mutex\
sstream\
stack\
stdexcept\
@@ -172,6 +175,14 @@ STD+= ${LIBCXXRTDIR}/${hdr}
.endfor
STDDIR= ${CXXINCLUDEDIR}
+EXP_HEADERS= dynarray\
+ optional
+
+.for hdr in ${EXP_HEADERS}
+EXP+= ${HDRDIR}/experimental/${hdr}
+.endfor
+EXPDIR= ${CXXINCLUDEDIR}/experimental
+
EXT_HEADERS= __hash\
hash_map\
hash_set
OpenPOWER on IntegriCloud