Remove pthread patches from libc++

external/bsd/libc++/Makefile.inc

@@ -4,9 +4,3 @@
 
 LIBCXXRT_SRCDIR:=	${.PARSEDIR}/dist/libcxxrt
 LIBCXX_SRCDIR:=	${.PARSEDIR}/dist/libcxx
-
-.if defined(__MINIX)
-# Should I try -D_LIBCPP_HAS_NO_THREADS ?
-#LDADD+= -lmthread
-#DPADD+= ${LIBMTHREAD}
-.endif # defined(__MINIX)

external/bsd/libc++/dist/libcxx/include/__config

@@ -90,10 +90,6 @@
 # define _LIBCPP_HAS_QUICK_EXIT
 #endif  // __NetBSD__
 
-#if defined(__minix)
-# define _LIBCPP_HAS_NO_THREADS 1
-#endif  // defined(__minix)
-
 #ifdef _WIN32
 #  define _LIBCPP_LITTLE_ENDIAN 1
 #  define _LIBCPP_BIG_ENDIAN    0

external/bsd/libc++/dist/libcxx/include/mutex

@@ -173,9 +173,7 @@ template<class Callable, class ...Args>
 */
 
 #include <__config>
-#if !defined(_LIBCPP_HAS_NO_THREADS) && defined(__minix)
 #include <__mutex_base>
-#endif // !defined(_LIBCPP_HAS_NO_THREADS) && defined(__minix)
 #include <functional>
 #include <memory>
 #ifndef _LIBCPP_HAS_NO_VARIADICS

external/bsd/libc++/dist/libcxxrt/src/exception.cc

@@ -29,15 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-
-#if !defined(__minix)
 #include <pthread.h>
-#else
-#define _MTHREADIFY_PTHREADS 1 
-#include <minix/mthread.h>
-#define LIBCXXRT_WEAK_LOCKS 1
-#endif /* !defined(__minix) */
-
 #include "typeinfo.h"
 #include "dwarf_eh.h"
 #include "atomic.h"

external/bsd/libc++/dist/libcxxrt/src/guard.cc

@@ -43,18 +43,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-
-#if !defined(__minix)
 #include <pthread.h>
-#else
-#define _MTHREADIFY_PTHREADS 1 
-#include <minix/mthread.h>
-#pragma weak sched_yield
-#define sched_yield() do {\
-	if (sched_yield) sched_yield();\
-	} while(0)
-#endif /* !defined(__minix) */
-
 #include <assert.h>
 #include "atomic.h"
 

external/bsd/libc++/lib/Makefile

@@ -8,16 +8,14 @@ NOLINT=		# defined
 
 .PATH: ${LIBCXX_SRCDIR}/src
 
-#__MINIX: Unsupported for now: shared_mutex.cpp
 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 \
-	stdexcept.cpp \
+	shared_mutex.cpp stdexcept.cpp \
 	string.cpp strstream.cpp system_error.cpp thread.cpp \
 	utility.cpp valarray.cpp
 # typeinfo.cc: prefer libcxxrt's version
 
-#__MINIX: Unsupported for now:
 LIBCXXRT_SRCS+= \
 	auxhelper.cc dynamic_cast.cc exception.cc guard.cc \
 	stdexcept.cc terminate.cc typeinfo.cc libelftc_dem_gnu3.c