Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2017-11-16 13:00:09 +01:00
commit 734a3fa32c

View File

@ -275,7 +275,7 @@ typedef struct {
o.sect[2].size = fofs(ofs) o.sect[2].size = fofs(ofs)
o.sect[3].type = f32(3) -- .strtab o.sect[3].type = f32(3) -- .strtab
o.sect[3].ofs = fofs(sofs + ofs) o.sect[3].ofs = fofs(sofs + ofs)
o.sect[3].size = fofs(#symname+1) o.sect[3].size = fofs(#symname+2)
ffi.copy(o.space+ofs+1, symname) ffi.copy(o.space+ofs+1, symname)
ofs = ofs + #symname + 2 ofs = ofs + #symname + 2
o.sect[4].type = f32(1) -- .rodata o.sect[4].type = f32(1) -- .rodata