From 2d0ef4522bebcc380e9aaf21b9bebcb62fcfc4fe Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Tue, 8 Dec 2009 19:50:21 +0100
Subject: LuaJIT 2.0.0-beta2 hotfix #1
Fix LUA_XCPATH.
Fix DWARF unwinding info for OSX.
---
src/buildvm_x86.dasc | 3 +--
src/luaconf.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/buildvm_x86.dasc b/src/buildvm_x86.dasc
index f6add4d0..09cfa6dc 100644
--- a/src/buildvm_x86.dasc
+++ b/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"
diff --git a/src/luaconf.h b/src/luaconf.h
index dfa0f1d5..3c85cacd 100644
--- a/src/luaconf.h
+++ b/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
--
cgit v1.2.3-55-g6feb