[PATCH 3/5] Import libc++ commit 01f3a59fb3e2542fce74c768718f594d0debd0da

[Michał Górny <mgorny%gentoo.org@localhost>]

---
 distrib/sets/lists/comp/mi                    |    55 +-
 [...]
 external/bsd/libc++/include/Makefile          |    53 +-
 external/bsd/libc++/lib/Makefile              |    18 +-
 external/bsd/libc++/prepare-import.sh         |     4 +-
 12046 files changed, 304844 insertions(+), 514836 deletions(-)
 [...]

diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 3135d7a9fcba..773891ae2cb0 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -209,25 +209,36 @@
 ./usr/include/bozohttpd.h			comp-c-include
 ./usr/include/bzlib.h				comp-c-include
 ./usr/include/c++/__bit_reference		comp-cxx-include	libcxx
+./usr/include/c++/__bsd_locale_defaults.h	comp-cxx-include	libcxx
+./usr/include/c++/__bsd_locale_fallbacks.h	comp-cxx-include	libcxx
 ./usr/include/c++/__config			comp-cxx-include	libcxx
 ./usr/include/c++/__debug			comp-cxx-include	libcxx
+./usr/include/c++/__errc			comp-cxx-include	libcxx
 ./usr/include/c++/__functional_03		comp-cxx-include	libcxx
 ./usr/include/c++/__functional_base		comp-cxx-include	libcxx
 ./usr/include/c++/__functional_base_03		comp-cxx-include	libcxx
 ./usr/include/c++/__hash_table			comp-cxx-include	libcxx
+./usr/include/c++/__libcpp_version		comp-cxx-include	libcxx
 ./usr/include/c++/__locale			comp-cxx-include	libcxx
 ./usr/include/c++/__mutex_base			comp-cxx-include	libcxx
+./usr/include/c++/__node_handle			comp-cxx-include	libcxx
+./usr/include/c++/__nullptr			comp-cxx-include	libcxx
 ./usr/include/c++/__split_buffer		comp-cxx-include	libcxx
 ./usr/include/c++/__sso_allocator		comp-cxx-include	libcxx
 ./usr/include/c++/__std_stream			comp-cxx-include	libcxx
+./usr/include/c++/__string			comp-cxx-include	libcxx
+./usr/include/c++/__threading_support		comp-cxx-include	libcxx
 ./usr/include/c++/__tree			comp-cxx-include	libcxx
 ./usr/include/c++/__tuple			comp-cxx-include	libcxx
 ./usr/include/c++/__tuple_03			comp-obsolete		obsolete
-./usr/include/c++/__undef___deallocate		comp-cxx-include	libcxx
-./usr/include/c++/__undef_min_max		comp-cxx-include	libcxx
+./usr/include/c++/__undef___deallocate		comp-obsolete		obsolete
+./usr/include/c++/__undef_macros		comp-cxx-include	libcxx
+./usr/include/c++/__undef_min_max		comp-obsolete		obsolete
 ./usr/include/c++/algorithm			comp-cxx-include	libcxx
+./usr/include/c++/any				comp-cxx-include	libcxx
 ./usr/include/c++/array				comp-cxx-include	libcxx
 ./usr/include/c++/atomic			comp-cxx-include	libcxx
+./usr/include/c++/bit				comp-cxx-include	libcxx
 ./usr/include/c++/bitset			comp-cxx-include	libcxx
 ./usr/include/c++/cassert			comp-cxx-include	libcxx
 ./usr/include/c++/ccomplex			comp-cxx-include	libcxx
@@ -235,6 +246,7 @@
 ./usr/include/c++/cerrno			comp-cxx-include	libcxx
 ./usr/include/c++/cfenv				comp-cxx-include	libcxx
 ./usr/include/c++/cfloat			comp-cxx-include	libcxx
+./usr/include/c++/charconv			comp-cxx-include	libcxx
 ./usr/include/c++/chrono			comp-cxx-include	libcxx
 ./usr/include/c++/cinttypes			comp-cxx-include	libcxx
 ./usr/include/c++/ciso646			comp-cxx-include	libcxx
@@ -242,6 +254,7 @@
 ./usr/include/c++/clocale			comp-cxx-include	libcxx
 ./usr/include/c++/cmath				comp-cxx-include	libcxx
 ./usr/include/c++/codecvt			comp-cxx-include	libcxx
+./usr/include/c++/compare			comp-cxx-include	libcxx
 ./usr/include/c++/complex			comp-cxx-include	libcxx
 ./usr/include/c++/complex.h			comp-cxx-include	libcxx
 ./usr/include/c++/condition_variable		comp-cxx-include	libcxx
@@ -262,20 +275,39 @@
 ./usr/include/c++/deque				comp-cxx-include	libcxx
 ./usr/include/c++/dynarray			comp-obsolete		obsolete
 ./usr/include/c++/exception			comp-cxx-include	libcxx
+./usr/include/c++/execution			comp-cxx-include	libcxx
 ./usr/include/c++/experimental/__config		comp-cxx-include	libcxx
+./usr/include/c++/experimental/__memory		comp-cxx-include	libcxx
 ./usr/include/c++/experimental/algorithm	comp-cxx-include	libcxx
-./usr/include/c++/experimental/chrono		comp-cxx-include	libcxx
-./usr/include/c++/experimental/dynarray		comp-cxx-include	libcxx
-./usr/include/c++/experimental/optional		comp-cxx-include	libcxx
-./usr/include/c++/experimental/ratio		comp-cxx-include	libcxx
-./usr/include/c++/experimental/string_view	comp-cxx-include	libcxx
-./usr/include/c++/experimental/system_error	comp-cxx-include	libcxx
-./usr/include/c++/experimental/tuple		comp-cxx-include	libcxx
+./usr/include/c++/experimental/chrono		comp-obsolete		obsolete
+./usr/include/c++/experimental/coroutine	comp-cxx-include	libcxx
+./usr/include/c++/experimental/deque		comp-cxx-include	libcxx
+./usr/include/c++/experimental/dynarray		comp-obsolete		obsolete
+./usr/include/c++/experimental/filesystem	comp-cxx-include	libcxx
+./usr/include/c++/experimental/forward_list	comp-cxx-include	libcxx
+./usr/include/c++/experimental/iterator		comp-cxx-include	libcxx
+./usr/include/c++/experimental/list		comp-cxx-include	libcxx
+./usr/include/c++/experimental/map		comp-cxx-include	libcxx
+./usr/include/c++/experimental/memory_resource	comp-cxx-include	libcxx
+./usr/include/c++/experimental/optional		comp-obsolete		obsolete
+./usr/include/c++/experimental/propagate_const	comp-cxx-include	libcxx
+./usr/include/c++/experimental/ratio		comp-obsolete		obsolete
+./usr/include/c++/experimental/regex		comp-cxx-include	libcxx
+./usr/include/c++/experimental/set		comp-cxx-include	libcxx
+./usr/include/c++/experimental/simd		comp-cxx-include	libcxx
+./usr/include/c++/experimental/string		comp-cxx-include	libcxx
+./usr/include/c++/experimental/string_view	comp-obsolete		obsolete
+./usr/include/c++/experimental/system_error	comp-obsolete		obsolete
+./usr/include/c++/experimental/tuple		comp-obsolete		obsolete
 ./usr/include/c++/experimental/type_traits	comp-cxx-include	libcxx
+./usr/include/c++/experimental/unordered_map	comp-cxx-include	libcxx
+./usr/include/c++/experimental/unordered_set	comp-cxx-include	libcxx
 ./usr/include/c++/experimental/utility		comp-cxx-include	libcxx
+./usr/include/c++/experimental/vector		comp-cxx-include	libcxx
 ./usr/include/c++/ext/__hash			comp-cxx-include	libcxx
 ./usr/include/c++/ext/hash_map			comp-cxx-include	libcxx
 ./usr/include/c++/ext/hash_set			comp-cxx-include	libcxx
+./usr/include/c++/filesystem			comp-cxx-include	libcxx
 ./usr/include/c++/forward_list			comp-cxx-include	libcxx
 ./usr/include/c++/fstream			comp-cxx-include	libcxx
 ./usr/include/c++/functional			comp-cxx-include	libcxx
@@ -291,6 +323,7 @@
 ./usr/include/c++/list				comp-cxx-include	libcxx
 ./usr/include/c++/locale			comp-cxx-include	libcxx
 ./usr/include/c++/map				comp-cxx-include	libcxx
+./usr/include/c++/math.h			comp-cxx-include	libcxx
 ./usr/include/c++/memory			comp-cxx-include	libcxx
 ./usr/include/c++/mutex				comp-cxx-include	libcxx
 ./usr/include/c++/new				comp-cxx-include	libcxx
@@ -304,11 +337,13 @@
 ./usr/include/c++/scoped_allocator		comp-cxx-include	libcxx
 ./usr/include/c++/set				comp-cxx-include	libcxx
 ./usr/include/c++/shared_mutex			comp-cxx-include	libcxx
+./usr/include/c++/span				comp-cxx-include	libcxx
 ./usr/include/c++/sstream			comp-cxx-include	libcxx
 ./usr/include/c++/stack				comp-cxx-include	libcxx
 ./usr/include/c++/stdexcept			comp-cxx-include	libcxx
 ./usr/include/c++/streambuf			comp-cxx-include	libcxx
 ./usr/include/c++/string			comp-cxx-include	libcxx
+./usr/include/c++/string_view			comp-cxx-include	libcxx
 ./usr/include/c++/strstream			comp-cxx-include	libcxx
 ./usr/include/c++/system_error			comp-cxx-include	libcxx
 ./usr/include/c++/tgmath.h			comp-cxx-include	libcxx
@@ -321,7 +356,9 @@
 ./usr/include/c++/unordered_set			comp-cxx-include	libcxx
 ./usr/include/c++/utility			comp-cxx-include	libcxx
 ./usr/include/c++/valarray			comp-cxx-include	libcxx
+./usr/include/c++/variant			comp-cxx-include	libcxx
 ./usr/include/c++/vector			comp-cxx-include	libcxx
+./usr/include/c++/version			comp-cxx-include	libcxx
 ./usr/include/cbor				comp-c-include
 ./usr/include/cbor.h				comp-c-include
 ./usr/include/cbor/arrays.h			comp-c-include

# [stripped 41 MiB of dist/ changes]

diff --git a/external/bsd/libc++/include/Makefile b/external/bsd/libc++/include/Makefile
index 7a5a6dfeb4d5..805749b47199 100644
--- a/external/bsd/libc++/include/Makefile
+++ b/external/bsd/libc++/include/Makefile
@@ -7,24 +7,33 @@
 INCSDIR=	/usr/include/c++
 
 INCS=	__bit_reference \
+	__bsd_locale_defaults.h \
+	__bsd_locale_fallbacks.h \
 	__config \
 	__debug \
+	__errc \
 	__functional_03 \
 	__functional_base \
 	__functional_base_03 \
 	__hash_table \
+	__libcpp_version \
 	__locale \
 	__mutex_base \
+	__node_handle \
+	__nullptr \
 	__split_buffer \
 	__sso_allocator \
 	__std_stream \
+	__string \
+	__threading_support \
 	__tree \
 	__tuple \
-	__undef___deallocate \
-	__undef_min_max \
+	__undef_macros \
 	algorithm \
+	any \
 	array \
 	atomic \
+	bit \
 	bitset \
 	cassert \
 	ccomplex \
@@ -32,6 +41,7 @@ INCS=	__bit_reference \
 	cerrno \
 	cfenv \
 	cfloat \
+	charconv \
 	chrono \
 	cinttypes \
 	ciso646 \
@@ -39,6 +49,7 @@ INCS=	__bit_reference \
 	clocale \
 	cmath \
 	codecvt \
+	compare \
 	complex \
 	complex.h \
 	condition_variable \
@@ -57,6 +68,7 @@ INCS=	__bit_reference \
 	cwctype \
 	deque \
 	exception \
+	execution \
 	forward_list \
 	fstream \
 	functional \
@@ -68,14 +80,17 @@ INCS=	__bit_reference \
 	iostream \
 	istream \
 	iterator \
+	filesystem \
 	limits \
 	list \
 	locale \
 	map \
+	math.h \
 	memory \
 	mutex \
 	new \
 	numeric \
+	optional \
 	ostream \
 	queue \
 	random \
@@ -84,24 +99,28 @@ INCS=	__bit_reference \
 	scoped_allocator \
 	set \
 	shared_mutex \
+	span \
 	sstream \
 	stack \
 	stdexcept \
 	streambuf \
 	string \
+	string_view \
 	strstream \
 	system_error \
 	tgmath.h \
 	thread \
 	tuple \
+	type_traits \
 	typeindex \
 	typeinfo \
-	type_traits \
 	unordered_map \
 	unordered_set \
 	utility \
 	valarray \
-	vector
+	variant \
+	vector \
+	version
 
 INCS+=		cxxabi.h
 
@@ -109,16 +128,26 @@ INCS+=	ext/__hash \
 	ext/hash_map \
 	ext/hash_set
 INCS+=	experimental/__config \
+	experimental/__memory \
 	experimental/algorithm \
-	experimental/chrono \
-	experimental/dynarray \
-	experimental/optional \
-	experimental/ratio \
-	experimental/string_view \
-	experimental/system_error \
-	experimental/tuple \
+	experimental/coroutine \
+	experimental/deque \
+	experimental/filesystem \
+	experimental/forward_list \
+	experimental/iterator \
+	experimental/list \
+	experimental/map \
+	experimental/memory_resource \
+	experimental/propagate_const \
+	experimental/regex \
+	experimental/set \
+	experimental/simd \
+	experimental/string \
 	experimental/type_traits \
-	experimental/utility
+	experimental/unordered_map \
+	experimental/unordered_set \
+	experimental/utility \
+	experimental/vector
 
 cxxabi.h: ${LIBCXXRT_SRCDIR}/src/cxxabi.h
 	cp ${LIBCXXRT_SRCDIR}/src/cxxabi.h .
diff --git a/external/bsd/libc++/lib/Makefile b/external/bsd/libc++/lib/Makefile
index bee01d7f36c2..11903dc33708 100644
--- a/external/bsd/libc++/lib/Makefile
+++ b/external/bsd/libc++/lib/Makefile
@@ -8,12 +8,13 @@ NOLINT=		# defined
 
 .PATH: ${LIBCXX_SRCDIR}/src
 
-SRCS=	algorithm.cpp bind.cpp chrono.cpp condition_variable.cpp debug.cpp \
-	exception.cpp future.cpp hash.cpp ios.cpp iostream.cpp locale.cpp \
-	memory.cpp mutex.cpp new.cpp optional.cpp random.cpp regex.cpp \
-	shared_mutex.cpp stdexcept.cpp \
-	string.cpp strstream.cpp system_error.cpp thread.cpp \
-	utility.cpp valarray.cpp
+SRCS=	algorithm.cpp bind.cpp charconv.cpp chrono.cpp \
+	condition_variable.cpp condition_variable_destructor.cpp debug.cpp \
+	exception.cpp functional.cpp future.cpp hash.cpp ios.cpp iostream.cpp \
+	locale.cpp memory.cpp mutex.cpp mutex_destructor.cpp new.cpp \
+	optional.cpp random.cpp regex.cpp shared_mutex.cpp stdexcept.cpp \
+	string.cpp strstream.cpp system_error.cpp thread.cpp utility.cpp \
+	valarray.cpp variant.cpp vector.cpp
 # typeinfo.cc: prefer libcxxrt's version
 
 LIBCXXRT_SRCS+= \
@@ -34,7 +35,7 @@ CLEANFILES+=	rt_${src}
 .include <bsd.own.mk>
 
 CPPFLAGS+=	-nostdinc++ -cxx-isystem ${LIBCXX_SRCDIR}/include -I${LIBCXXRT_SRCDIR}/src
-CPPFLAGS+=	-DLIBCXXRT
+CPPFLAGS+=	-DLIBCXXRT -D_LIBCPP_BUILDING_LIBRARY
 CXXFLAGS+=	-std=c++11
 
 CWARNFLAGS.gcc+=	-Wno-error
@@ -43,7 +44,6 @@ CWARNFLAGS.clang+=	-Wno-error=unused-variable -Wno-error=missing-noreturn
 CWARNFLAGS.clang+=	-Wno-error=missing-prototypes -Wno-error=sometimes-uninitialized
 CWARNFLAGS.clang+=	-Wno-error=missing-field-initializers -Wno-error=switch
 CWARNFLAGS.clang+=	-Wno-error=implicit-exception-spec-mismatch
-
 # with SSP and FORTIFY, on earm...
 COPTS.rt_libelftc_dem_gnu3.c += ${${ACTIVE_CC} == "clang":? -Wno-error=builtin-memcpy-chk-size :}
 
@@ -56,3 +56,5 @@ CWARNFLAGS+=		-Wno-atomic-alignment
 .endif
 
 .include <bsd.lib.mk>
+
+CXXFLAGS+=	-Wno-old-style-cast
diff --git a/external/bsd/libc++/prepare-import.sh b/external/bsd/libc++/prepare-import.sh
index f763ddbee260..904ef5cac3bd 100755
--- a/external/bsd/libc++/prepare-import.sh
+++ b/external/bsd/libc++/prepare-import.sh
@@ -8,8 +8,8 @@
 set -e
 
 cd dist/libcxx
-rm -rf .svn cmake Makefile CMakeLists.txt lib src/support www .arcconfig
-rm -rf include/support */CMakeLists.txt .gitignore appveyor* docs
+rm -rf .svn cmake Makefile CMakeLists.txt lib www .arcconfig
+rm -rf */CMakeLists.txt .gitignore appveyor* docs
 rm -rf benchmarks fuzzing utils
 cd ../libcxxrt
 rm -rf .git CMakeLists.txt */CMakeLists.txt src/doxygen_config
-- 
2.25.1