From a7e9ae55f4b3a71207c2cee2189e2cc584591d22 Mon Sep 17 00:00:00 2001 From: Araq Date: Sun, 29 Jan 2012 23:04:07 +0100 Subject: [PATCH] tlsEmulation:on for windows/GCC --- config/nimrod.cfg | 3 +++ lib/system/debugger.nim | 2 +- tests/compile/tsortdev.nim | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/nimrod.cfg b/config/nimrod.cfg index d81295e66f..205ed17658 100755 --- a/config/nimrod.cfg +++ b/config/nimrod.cfg @@ -73,6 +73,9 @@ icc.options.linker = "-cxxlib" # Configuration for the GNU C/C++ compiler: @if windows: #gcc.path = r"$nimrod\dist\mingw\bin" + @if gcc: + tlsEmulation:on + @end @end gcc.options.debug = "-g3 -O0" diff --git a/lib/system/debugger.nim b/lib/system/debugger.nim index 6d5e2d6489..564f080d1f 100755 --- a/lib/system/debugger.nim +++ b/lib/system/debugger.nim @@ -55,7 +55,7 @@ var # in it dbgState: TDbgState # state of debugger dbgBP: array[0..127, TDbgBreakpoint] # breakpoints - dbgBPlen: int = 0 + dbgBPlen: int dbgSkipToFrame: PFrame # frame to be skipped to diff --git a/tests/compile/tsortdev.nim b/tests/compile/tsortdev.nim index baf238d9e1..1b7705d812 100755 --- a/tests/compile/tsortdev.nim +++ b/tests/compile/tsortdev.nim @@ -28,7 +28,7 @@ when isMainModule: var data: seq[string] = @[] var L = random(59) - for i in 0..10_000: + for i in 0..2: #echo "loop: ", i #newSeq(data, L) setLen(data, L) @@ -45,7 +45,7 @@ when isMainModule: if not sorted(data, order): quit "bubblesort failed" - #sort(copy, cmp, order) + sort(copy, cmp, order) for j in 0 .. L-1: let rc = getRefcount(data[j]) if rc != 1: