fixes #19713; Revert "Remove tlsEmulation enabled from Windows + GCC config" (#19119) (#20327)

* Revert "Remove tlsEmulation enabled from Windows + GCC config (#19119) [backport:1.6]"

This reverts commit 77b696c2c9.

* increase nimTlsSize to 48000

* enable for windows

* fixes tests

* fixes tlsEmulation:on
This commit is contained in:
ringabout
2022-09-19 15:16:54 +08:00
committed by GitHub
parent f6dc30e52d
commit 97259a5ab3
4 changed files with 12 additions and 2 deletions

View File

@@ -11,6 +11,7 @@ define:nimPreviewSlimSystem
@if windows:
cincludes: "$lib/wrappers/libffi/common"
tlsEmulation:off
@end
define:useStdoutAsStdmsg

View File

@@ -86,8 +86,12 @@ proc newRope(data: string = ""): Rope =
result.L = -data.len
result.data = data
var
cache {.threadvar.} : array[0..2048*2 - 1, Rope]
when compileOption("tlsEmulation"): # fixme: be careful if you want to make ropes support multiple threads
var
cache: array[0..2048*2 - 1, Rope]
else:
var
cache {.threadvar.} : array[0..2048*2 - 1, Rope]
proc resetRopeCache* =
for i in low(cache)..high(cache):

View File

@@ -169,6 +169,9 @@ nimblepath="$home/.nimble/pkgs/"
# Configuration for the GNU C/C++ compiler:
@if windows:
#gcc.path = r"$nim\dist\mingw\bin"
@if gcc or tcc:
tlsEmulation:on
@end
@end
gcc.maxerrorsimpl = "-fmax-errors=3"

View File

@@ -40,3 +40,5 @@ switch("define", "nimPreviewFloatRoundtrip")
switch("define", "nimPreviewDotLikeOps")
switch("define", "nimPreviewJsonutilsHoleyEnum")
switch("define", "nimPreviewHashRef")
when defined(windows):
switch("tlsEmulation", "off")