xbox: Add C++11 thread support

Author: thrimbor

Makefile.nxdk

@@ -34,6 +34,7 @@ LIBCXX_SRCS += $(LIBCXX_DIR)/src/valarray.cpp
 LIBCXX_SRCS += $(LIBCXX_DIR)/src/variant.cpp
 LIBCXX_SRCS += $(LIBCXX_DIR)/src/vector.cpp
 LIBCXX_SRCS += $(LIBCXX_DIR)/src/support/win32/support.cpp
+LIBCXX_SRCS += $(LIBCXX_DIR)/src/support/win32/thread_win32.cpp
 LIBCXX_OBJS = $(addsuffix .obj, $(basename $(LIBCXX_SRCS)))
 
 $(NXDK_DIR)/lib/libc++.lib: $(LIBCXX_OBJS)

include/__config

@@ -14,7 +14,6 @@
 #define _LIBCPP_NO_AUTO_LINK
 #define _LIBCPP_NO_EXCEPTIONS
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
-#define _LIBCPP_HAS_NO_THREADS
 #define _LIBCPP_BUILDING_LIBRARY
 #define _LIBCPP_HAS_NO_STDIN
 #define _LIBCPP_HAS_NO_STDOUT

include/__threading_support

@@ -84,7 +84,10 @@ typedef pthread_key_t __libcpp_tls_key;
 typedef void* __libcpp_mutex_t;
 #define _LIBCPP_MUTEX_INITIALIZER 0
 
-#if defined(_M_IX86) || defined(__i386__) || defined(_M_ARM) || defined(__arm__)
+#if defined(NXDK)
+// Size of CRITICAL_SECTION is different in nxdk
+typedef void* __libcpp_recursive_mutex_t[7];
+#elif defined(_M_IX86) || defined(__i386__) || defined(_M_ARM) || defined(__arm__)
 typedef void* __libcpp_recursive_mutex_t[6];
 #elif defined(_M_AMD64) || defined(__x86_64__) || defined(_M_ARM64) || defined(__aarch64__)
 typedef void* __libcpp_recursive_mutex_t[5];
@@ -93,8 +96,16 @@ typedef void* __libcpp_recursive_mutex_t[5];
 #endif
 
 // Condition Variable
+#if defined(NXDK)
+// Size and content of CONDITION_VARIABLE are different in nxdk
+static_assert(sizeof(int) == sizeof(void*));
+typedef int __libcpp_condvar_t[4];
+// Set it to INIT_ONCE_STATIC_INIT, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0 (same as CONDITION_VARIABLE_INIT)
+#define _LIBCPP_CONDVAR_INITIALIZER {0, -1, -1, 0}
+#else
 typedef void* __libcpp_condvar_t;
 #define _LIBCPP_CONDVAR_INITIALIZER 0
+#endif
 
 // Execute Once
 typedef void* __libcpp_exec_once_flag;

src/support/win32/thread_win32.cpp

@@ -132,7 +132,13 @@ int __libcpp_condvar_timedwait(__libcpp_condvar_t *__cv, __libcpp_mutex_t *__m,
 
 int __libcpp_condvar_destroy(__libcpp_condvar_t *__cv)
 {
+#if defined(NXDK)
+  // Condition variables in nxdk use events, so they need to be uninitialized
+  // to release the event handles.
+  UninitializeConditionVariable(reinterpret_cast<PCONDITION_VARIABLE>(__cv));
+#else
   static_cast<void>(__cv);
+#endif
   return 0;
 }
 

src/system_error.cpp

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define __STDC_WANT_LIB_EXT1__ 1
 #include "__config"
 
 #include "system_error"

src/thread.cpp

@@ -14,7 +14,9 @@
 #include "vector"
 #include "future"
 #include "limits"
+#ifndef NXDK
 #include <sys/types.h>
+#endif
 
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 # include <sys/param.h>