updated stdc++ for gcc 13

stateos · Apr 20, 2024 · 1fbf8d1 · 1fbf8d1
1 parent 2325e16
commit 1fbf8d1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/stateos/stdc++/bits/gthr-default.h b/stateos/stdc++/bits/gthr-default.h
@@ -36,20 +36,6 @@
 #include "inc/osmutex.h"
 #include "inc/osonceflag.h"
 #include "inc/osconditionvariable.h"
-#include "inc/critical_section.hh"
-#include "inc/chrono.hh"
-
-#if !__cpp_lib_atomic_wait || !__cpp_aligned_new
-#include "inc/barrier.hh"
-#endif
-
-#if !__cpp_lib_atomic_wait
-#include "inc/latch.hh"
-#endif
-
-#if !__cpp_lib_atomic_wait && !_GLIBCXX_HAVE_POSIX_SEMAPHORE
-#include "inc/semaphore.hh"
-#endif
 
 //-----------------------------------------------------------------------------
 
@@ -67,6 +53,7 @@
 #define __GTHREADS_CXX0X 1
 #define __GTHREAD_HAS_COND 1
 #define  _GLIBCXX_HAVE_TLS 1
+#define  _GLIBCXX_THREAD_IMPL 1
 #define  _GLIBCXX_USE_SCHED_YIELD 1
 #define  _GTHREAD_USE_MUTEX_TIMEDLOCK 1
 
@@ -89,6 +76,9 @@ typedef ostime_t __gthread_time_t;
 #define __GTHREAD_RECURSIVE_MUTEX_INIT _MTX_INIT(mtxPrioInherit|mtxRecursive, 0)
 #define __GTHREAD_COND_INIT            _CND_INIT()
 
+#include "inc/critical_section.hh"
+#include "inc/chrono.hh"
+
 //-----------------------------------------------------------------------------
 extern "C"
 {
@@ -301,4 +291,18 @@ int   __gthread_setspecific(__gthread_key_t key, const void *ptr);
 } // extern "C"
 //-----------------------------------------------------------------------------
 
+#if !__cpp_lib_atomic_wait || !__cpp_aligned_new
+#include "inc/barrier.hh"
+#endif
+
+#if !__cpp_lib_atomic_wait
+#include "inc/latch.hh"
+#endif
+
+#if !__cpp_lib_atomic_wait && !_GLIBCXX_HAVE_POSIX_SEMAPHORE
+#include "inc/semaphore.hh"
+#endif
+
+//-----------------------------------------------------------------------------
+
 #endif //_GLIBCXX_GCC_GTHR_STATEOS_H
diff --git a/stateos/stdc++/inc/chrono.hh b/stateos/stdc++/inc/chrono.hh
@@ -33,7 +33,11 @@
 #define __STATEOS_CHRONO_HH
 
 #include "inc/osclock.h"
+#if __GNUC__ < 12
 #include <chrono>
+#else
+#include <bits/chrono.h>
+#endif
 
 namespace std {
 namespace chrono {