Skip to content

Commit 56a1597

Browse files
ringaboutnarimiran
authored andcommitted
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 77b696c. * increase nimTlsSize to 48000 * enable for windows * fixes tests * fixes tlsEmulation:on (cherry picked from commit 97259a5)
1 parent cba0c20 commit 56a1597

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

compiler/nim.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ define:nimPreviewFloatRoundtrip
1010

1111
@if windows:
1212
cincludes: "$lib/wrappers/libffi/common"
13+
tlsEmulation:off
1314
@end
1415

1516
define:useStdoutAsStdmsg

config/nim.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ nimblepath="$home/.nimble/pkgs/"
156156
# Configuration for the GNU C/C++ compiler:
157157
@if windows:
158158
#gcc.path = r"$nim\dist\mingw\bin"
159+
@if gcc or tcc:
160+
tlsEmulation:on
161+
@end
159162
@end
160163

161164
gcc.maxerrorsimpl = "-fmax-errors=3"

tests/config.nims

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ switch("define", "nimPreviewFloatRoundtrip")
4040
switch("define", "nimPreviewDotLikeOps")
4141
switch("define", "nimPreviewJsonutilsHoleyEnum")
4242
switch("define", "nimPreviewHashRef")
43+
when defined(windows):
44+
switch("tlsEmulation", "off")

0 commit comments

Comments
 (0)