Merge pull request #2995 from avsej/fix-tls-dlopen-issue

Fix #2672. Do not define globalsSlot for native TLS

lib/system/dyncalls.nim

@@ -147,4 +147,3 @@ else:
   {.error: "no implementation for dyncalls".}
 
 {.pop.}
-

lib/system/threads.nim

@@ -196,14 +196,21 @@ type
       nil
 {.deprecated: [TThreadLocalStorage: ThreadLocalStorage, TGcThread: GcThread].}
 
+when not defined(useNimRtl):
+  when not useStackMaskHack:
+    var mainThread: GcThread
+
+#const globalsSlot = ThreadVarSlot(0)
+#sysAssert checkSlot.int == globalsSlot.int
+
+when emulatedThreadVars:
   # XXX it'd be more efficient to not use a global variable for the
   # thread storage slot, but to rely on the implementation to assign slot X
   # for us... ;-)
   var globalsSlot: ThreadVarSlot
 
-when not defined(useNimRtl):
+  proc GetThreadLocalVars(): pointer {.compilerRtl, inl.} =
-  when not useStackMaskHack:
+    result = addr(cast[PGcThread](threadVarGetValue(globalsSlot)).tls)
-    var mainThread: GcThread
 
   proc initThreadVarsEmulation() {.compilerProc, inline.} =
     when not defined(useNimRtl):
@@ -211,13 +218,6 @@ proc initThreadVarsEmulation() {.compilerProc, inline.} =
       when declared(mainThread):
         threadVarSetValue(globalsSlot, addr(mainThread))
 
-#const globalsSlot = ThreadVarSlot(0)
-#sysAssert checkSlot.int == globalsSlot.int
-
-when emulatedThreadVars:
-  proc GetThreadLocalVars(): pointer {.compilerRtl, inl.} =
-    result = addr(cast[PGcThread](threadVarGetValue(globalsSlot)).tls)
-
 when useStackMaskHack:
   proc maskStackPointer(offset: int): pointer {.compilerRtl, inl.} =
     var x {.volatile.}: pointer
@@ -398,11 +398,6 @@ proc threadId*[TArg](t: var Thread[TArg]): ThreadId[TArg] {.inline.} =
   ## returns the thread ID of `t`.
   result = addr(t)
 
-proc myThreadId*[TArg](): ThreadId[TArg] =
-  ## returns the thread ID of the thread that calls this proc. This is unsafe
-  ## because the type ``TArg`` is not checked for consistency!
-  result = cast[ThreadId[TArg]](threadVarGetValue(globalsSlot))
-
 when false:
   proc mainThreadId*[TArg](): ThreadId[TArg] =
     ## returns the thread ID of the main thread.
@@ -413,4 +408,3 @@ when useStackMaskHack:
     var mainThread: Thread[pointer]
     createThread(mainThread, tp)
     joinThread(mainThread)
-