diff options
| author | Araq <rumpf_a@web.de> | 2014-04-20 21:34:17 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-04-20 21:34:17 +0200 |
| commit | da7d6c844604e443c47fe0317e579d9d61e5fa3d (patch) | |
| tree | 8c2d1b1e985a78d9f8a9d010087be858434e7aad | |
| parent | 1bb0bdec246dbc9ed3bc967ca4e1e70b6fbb35bd (diff) | |
| download | Nim-da7d6c844604e443c47fe0317e579d9d61e5fa3d.tar.gz | |
fixes bootstrapping
| -rw-r--r-- | lib/system.nim | 4 | ||||
| -rw-r--r-- | lib/system/sysspawn.nim | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/system.nim b/lib/system.nim index a78ceb3fe..273820b82 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -193,6 +193,8 @@ when defined(nimNewShared): `shared`* {.magic: "Shared".} guarded* {.magic: "Guarded".} +include "system/inclrtl" + const NoFakeVars* = defined(NimrodVM) ## true if the backend doesn't support \ ## "fake variables" like 'var EBADF {.importc.}: cint'. @@ -1027,8 +1029,6 @@ template sysAssert(cond: bool, msg: string) = echo "[SYSASSERT] ", msg quit 1 -include "system/inclrtl" - when not defined(JS) and not defined(nimrodVm) and hostOS != "standalone": include "system/cgprocs" diff --git a/lib/system/sysspawn.nim b/lib/system/sysspawn.nim index 0a56d6844..93a39fa79 100644 --- a/lib/system/sysspawn.nim +++ b/lib/system/sysspawn.nim @@ -121,6 +121,7 @@ proc slave(w: ptr Worker) {.thread.} = signal(gSomeReady) await(w.taskArrived) assert(not w.ready) + # shield against spurious wakeups: if w.data != nil: w.f(w, w.data) w.data = nil |