From: Mike Pall <mike>
Date: Thu, 6 Mar 2014 16:54:48 +0000 (+0100)
Subject: DynASM: Emit version check after .arch directive.
X-Git-Tag: v2.0.3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80efb077500ca368b26aab0aadcc4e2e877b10ab;p=thirdparty%2FLuaJIT.git

DynASM: Emit version check after .arch directive.
---

diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua
index 2c0970d8..0ea8697c 100644
--- a/dynasm/dynasm.lua
+++ b/dynasm/dynasm.lua
@@ -695,6 +695,9 @@ map_op[".arch_1"] = function(params)
   if not params then return "name" end
   local err = loadarch(params[1])
   if err then wfatal(err) end
+  wline(format("#if DASM_VERSION != %d", _info.vernum))
+  wline('#error "Version mismatch between DynASM and included encoding engine"')
+  wline("#endif")
 end
 
 -- Dummy .arch pseudo-opcode to improve the error report.
@@ -877,13 +880,9 @@ local function dasmhead(out)
 ** DO NOT EDIT! The original file is in "%s".
 */
 
-#if DASM_VERSION != %d
-#error "Version mismatch between DynASM and included encoding engine"
-#endif
-
 ]], _info.url,
     _info.version, g_arch._info.arch, g_arch._info.version,
-    g_fname, _info.vernum))
+    g_fname))
 end
 
 -- Read input file.