summary refs log tree commit diff stats
path: root/compiler
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2014-08-14 02:44:02 +0200
committerAndreas Rumpf <rumpf_a@web.de>2014-08-14 02:44:02 +0200
commitfe3d9dd2b692f5108b873b726946b6d8eab489f4 (patch)
tree2ae7f30d28280e75b9fcca264c61bd1df5fec124 /compiler
parentadd0a0e9bc5383923eef9c764788feb810f8edc6 (diff)
parenta772105e7d1662cfc3bf4ce382349d4ea4b72a30 (diff)
downloadNim-fe3d9dd2b692f5108b873b726946b6d8eab489f4.tar.gz
Merge pull request #1480 from rbehrends/fix-stackscan2
Fixed stack bottom initialization for DLLs.
Diffstat (limited to 'compiler')
-rw-r--r--compiler/cgen.nim2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 41f380d1b..112a2af34 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -967,11 +967,11 @@ proc genMainProc(m: BModule) =
     # functions, which might otherwise merge their stack frames.
     NimMainBody =
       "N_CDECL(void, NimMainInner)(void) {$N" &
-        "\tPreMain();$N" &
         "$1" &
       "}$N$N" &
       "N_CDECL(void, NimMain)(void) {$N" &
         "\tvoid (*volatile inner)();$N" &
+        "\tPreMain();$N" &
         "\tinner = NimMainInner;$N" &
         "$2" &
         "\t(*inner)();$N" &