fixes nim-lang#18146; fixes nim-lang#19372; disable tlsEmulation on w…

…indows; static link pthreads with mingw (nim-lang#21668) * fixes nim-lang#18146; disable tlsEmulation on windows; static link libwinthreads DLL * whatever
bung87 · Jul 29, 2023 · 8dbce4f · 8dbce4f
1 parent 4bcbe9c
commit 8dbce4f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/compiler/nim.cfg b/compiler/nim.cfg
@@ -14,7 +14,6 @@ threads:off
 
 @if windows:
   cincludes: "$lib/wrappers/libffi/common"
-  tlsEmulation:off
 @end
 
 define:useStdoutAsStdmsg

diff --git a/config/nim.cfg b/config/nim.cfg
@@ -179,7 +179,7 @@ nimblepath="$home/.nimble/pkgs/"
 # Configuration for the GNU C/C++ compiler:
 @if windows:
   #gcc.path = r"$nim\dist\mingw\bin"
-  @if gcc or tcc:
+  @if tcc:
     tlsEmulation:on
   @end
 @end

diff --git a/lib/std/typedthreads.nim b/lib/std/typedthreads.nim
@@ -34,6 +34,10 @@
 ##
 ##  deinitLock(L)
 
+
+when defined(windows) and defined(gcc) and (not compileOption("tlsEmulation")):
+  {.passl: "-Wl,-Bstatic -lpthread -Wl,-Bdynamic".}
+
 import std/private/[threadtypes]
 export Thread
 

diff --git a/tests/config.nims b/tests/config.nims
@@ -40,8 +40,6 @@ switch("define", "nimPreviewDotLikeOps")
 switch("define", "nimPreviewJsonutilsHoleyEnum")
 switch("define", "nimPreviewHashRef")
 switch("define", "nimPreviewRangeDefault")
-when defined(windows):
-  switch("tlsEmulation", "off")
 
 switch("warningAserror", "UnnamedBreak")
 switch("legacy", "verboseTypeMismatch")
diff --git a/tests/ic/config.nims b/tests/ic/config.nims
@@ -1,3 +1 @@
-when defined(windows):
-  --tlsEmulation:off
 --mm:refc