From ae9be5716058f386e0e2fde301dd57eb1df2f71e Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Sun, 26 Nov 2017 08:17:07 +0000
Subject: [PATCH] Remove pthread patches from libc++

---
 external/bsd/libc++/Makefile.inc                   |  6 ------
 external/bsd/libc++/dist/libcxx/include/__config   |  4 ----
 external/bsd/libc++/dist/libcxx/include/mutex      |  2 --
 external/bsd/libc++/dist/libcxxrt/src/exception.cc |  8 --------
 external/bsd/libc++/dist/libcxxrt/src/guard.cc     | 11 -----------
 external/bsd/libc++/lib/Makefile                   |  4 +---
 6 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/external/bsd/libc++/Makefile.inc b/external/bsd/libc++/Makefile.inc
index 85506e0ea..e82ada5ff 100644
--- a/external/bsd/libc++/Makefile.inc
+++ b/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)
diff --git a/external/bsd/libc++/dist/libcxx/include/__config b/external/bsd/libc++/dist/libcxx/include/__config
index 8cf872069..0c5af6177 100644
--- a/external/bsd/libc++/dist/libcxx/include/__config
+++ b/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
diff --git a/external/bsd/libc++/dist/libcxx/include/mutex b/external/bsd/libc++/dist/libcxx/include/mutex
index 40614dc0f..373d75b09 100644
--- a/external/bsd/libc++/dist/libcxx/include/mutex
+++ b/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
diff --git a/external/bsd/libc++/dist/libcxxrt/src/exception.cc b/external/bsd/libc++/dist/libcxxrt/src/exception.cc
index 73044954b..7781ebbeb 100644
--- a/external/bsd/libc++/dist/libcxxrt/src/exception.cc
+++ b/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"
diff --git a/external/bsd/libc++/dist/libcxxrt/src/guard.cc b/external/bsd/libc++/dist/libcxxrt/src/guard.cc
index df5d3c586..34d294cf7 100644
--- a/external/bsd/libc++/dist/libcxxrt/src/guard.cc
+++ b/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"
 
diff --git a/external/bsd/libc++/lib/Makefile b/external/bsd/libc++/lib/Makefile
index e8bb6b3c3..91b304416 100644
--- a/external/bsd/libc++/lib/Makefile
+++ b/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