mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-25 07:02:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use tls_model("global-dynamic") for JKRHeap on GCC

Browse Source
This commit is contained in:
Luke Street
2026-02-28 13:16:42 -07:00
parent 6340087698
commit f38dcf3aef
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JKernel/JKRHeap.cpp
+8 -1
View File
@@ -31,7 +31,14 @@ JKRHeap* JKRHeap::sSystemHeap;
#if TARGET_PC
// JSystem normally has a thread switch callback to track the correct heap.
// We can't do this as we're (currently) using true OS threads. So use a true thread local.
static thread_local JKRHeap* sCurrentHeap;
// On Linux/GCC, thread_local in a shared library requires global-dynamic TLS model
// (the default local-exec is incompatible with -fPIC). MSVC and macOS/Clang handle this automatically.
#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER)
#define TLS_GLOBAL_DYNAMIC __attribute__((tls_model("global-dynamic")))
#else
#define TLS_GLOBAL_DYNAMIC
#endif
static thread_local TLS_GLOBAL_DYNAMIC JKRHeap* sCurrentHeap;
#else
JKRHeap* JKRHeap::sCurrentHeap;
#endif