From 22ca1336dcfb663d86a6892dbe1e48eee20bb6db Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Wed, 5 Mar 2014 19:30:36 +0000
Subject: 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
---
 lib/libc++/Makefile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'lib/libc++')

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
-- 
cgit v1.1