aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2017-01-17 10:47:42 +0100
committerMike Pall <mike>2017-01-17 10:47:42 +0100
commit12c0df4189c3bd3daf9034afbb2773b92c883d44 (patch)
tree1913b9fb7fc5ba145ce2d83a93cbda5629844b2f
parent8e5d7bec0d110aa4ccd7e8492f697ff2a88a55ed (diff)
parenta2013dd39abfc036fc02d277ae3f053209d2c4fd (diff)
downloadluajit-12c0df4189c3bd3daf9034afbb2773b92c883d44.tar.gz
luajit-12c0df4189c3bd3daf9034afbb2773b92c883d44.tar.bz2
luajit-12c0df4189c3bd3daf9034afbb2773b92c883d44.zip
Merge branch 'master' into v2.1
-rw-r--r--src/jit/bcsave.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jit/bcsave.lua b/src/jit/bcsave.lua
index 5117f714..079ce19e 100644
--- a/src/jit/bcsave.lua
+++ b/src/jit/bcsave.lua
@@ -239,7 +239,7 @@ typedef struct {
239 hdr.type = f16(1) 239 hdr.type = f16(1)
240 hdr.machine = f16(({ x86=3, x64=62, arm=40, arm64=183, ppc=20, mips=8, mipsel=8 })[ctx.arch]) 240 hdr.machine = f16(({ x86=3, x64=62, arm=40, arm64=183, ppc=20, mips=8, mipsel=8 })[ctx.arch])
241 if ctx.arch == "mips" or ctx.arch == "mipsel" then 241 if ctx.arch == "mips" or ctx.arch == "mipsel" then
242 hdr.flags = 0x50001006 242 hdr.flags = f32(0x50001006)
243 end 243 end
244 hdr.version = f32(1) 244 hdr.version = f32(1)
245 hdr.shofs = fofs(ffi.offsetof(o, "sect")) 245 hdr.shofs = fofs(ffi.offsetof(o, "sect"))