Browse Source

LuaJIT 2.0.0-beta2 hotfix #1

Fix LUA_XCPATH.
Fix DWARF unwinding info for OSX.
Mike Pall 15 years ago
parent
commit
2d0ef4522b
2 changed files with 2 additions and 3 deletions
  1. 1 2
      src/buildvm_x86.dasc
  2. 1 1
      src/luaconf.h

+ 1 - 2
src/buildvm_x86.dasc

@@ -3650,7 +3650,6 @@ static void emit_asm_debug(BuildCtx *ctx)
 	".LEFDE1:\n\n", (int)ctx->codesz);
     break;
   case BUILD_machasm:
-    /* NYI: OSX ignores it. Something must be missing. */
     fprintf(ctx->fp, "\t.section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support\n");
     fprintf(ctx->fp,
 	"EH_frame1:\n"
@@ -3659,7 +3658,7 @@ static void emit_asm_debug(BuildCtx *ctx)
 	"LSCIE1:\n"
 	"\t.long 0\n"
 	"\t.byte 0x1\n"
-	"\t.ascii \"zPR\"\n"
+	"\t.ascii \"zPR\\0\"\n"
 	"\t.byte 0x1\n"
 	"\t.byte 128-4\n"
 	"\t.byte 0x8\n"

+ 1 - 1
src/luaconf.h

@@ -40,7 +40,7 @@
 #define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0-beta2/"
 #define LUA_XPATH \
   ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
-#define LUA_XCPATH	LUA_XROOT "lib/lua/5.1/?.lua;"
+#define LUA_XCPATH	LUA_XROOT "lib/lua/5.1/?.so;"
 #else
 #define LUA_JDIR	LUA_ROOT "share/luajit-2.0.0-beta2/"
 #define LUA_XPATH