gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2019-12-08 19:24:47 +01:00
commit 05898a8824
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/install.html
View File

@ -222,8 +222,8 @@ You can add an extra prefix to the search paths by appending the
make PREFIX=/home/myself/lj2 make PREFIX=/home/myself/lj2
</pre> </pre>
<p> <p>
Note for OSX: if the <tt>MACOSX_DEPLOYMENT_TARGET</tt> environment Note for OSX: you must set the <tt>MACOSX_DEPLOYMENT_TARGET</tt>
variable is not set, then it's forced to <tt>10.4</tt>. environment variable to a value supported by your toolchain.
</p> </p>
<h3>Installing LuaJIT</h3> <h3>Installing LuaJIT</h3>
<p> <p>

7
src/Makefile
View File

@ -158,7 +158,6 @@ XCFLAGS=
ifeq (Windows,$(findstring Windows,$(OS))$(MSYSTEM)$(TERM)) ifeq (Windows,$(findstring Windows,$(OS))$(MSYSTEM)$(TERM))
HOST_SYS= Windows HOST_SYS= Windows
HOST_RM= del
else else
HOST_SYS:= $(shell uname -s) HOST_SYS:= $(shell uname -s)
ifneq (,$(findstring MINGW,$(HOST_SYS))) ifneq (,$(findstring MINGW,$(HOST_SYS)))
@ -221,6 +220,7 @@ TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib
TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME) TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME)
TARGET_DLLNAME= lua$(NODOTABIVER).dll TARGET_DLLNAME= lua$(NODOTABIVER).dll
TARGET_DLLDOTANAME= libluajit-$(ABIVER).dll.a
TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME) TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
TARGET_DYNXLDOPTS= TARGET_DYNXLDOPTS=
@ -309,8 +309,9 @@ endif
TARGET_SYS?= $(HOST_SYS) TARGET_SYS?= $(HOST_SYS)
ifeq (Windows,$(TARGET_SYS)) ifeq (Windows,$(TARGET_SYS))
TARGET_STRIP+= --strip-unneeded TARGET_STRIP+= --strip-unneeded
TARGET_XSHLDFLAGS= -shared TARGET_XSHLDFLAGS= -shared -Wl,--out-implib,$(TARGET_DLLDOTANAME)
TARGET_DYNXLDOPTS= TARGET_DYNXLDOPTS=
HOST_RM= del
else else
TARGET_AR+= 2>/dev/null TARGET_AR+= 2>/dev/null
ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
@ -318,7 +319,7 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector
endif endif
ifeq (Darwin,$(TARGET_SYS)) ifeq (Darwin,$(TARGET_SYS))
ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
export MACOSX_DEPLOYMENT_TARGET=10.4 $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
endif endif
TARGET_STRIP+= -x TARGET_STRIP+= -x
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC

5
src/lj_err.c
View File

@ -287,12 +287,7 @@ LJ_FUNCA int lj_err_unwind_dwarf(int version, int actions,
} }
#if LJ_UNWIND_EXT #if LJ_UNWIND_EXT
#if LJ_TARGET_OSX || defined(__OpenBSD__)
/* Sorry, no thread safety for OSX. Complain to Apple, not me. */
static _Unwind_Exception static_uex;
#else
static __thread _Unwind_Exception static_uex; static __thread _Unwind_Exception static_uex;
#endif
/* Raise DWARF2 exception. */ /* Raise DWARF2 exception. */
static void err_raise_ext(int errcode) static void err_raise_ext(int errcode)