Skip to content

Commit 9d2ecaf

Browse files
t-lot-lo
committed
deps: upgrade to luajit-2.1.0-beta3, use 64bit GC
luajit-2.0.3 garbage collection uses 32bit addresses, limiting the amount of memory available to LUA scripts. This change updates to luajit-2.1.0-beta3, which optionally uses 64bit GC addresses, and activates this option at compile time. Signed-off-by: Thilo Fromm <[email protected]>
1 parent ada58d3 commit 9d2ecaf

File tree

214 files changed

+37710
-11755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+37710
-11755
lines changed

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $(ODIR)/%.o : %.c
5959

6060
$(LDIR)/libluajit.a:
6161
@echo Building LuaJIT...
62-
@$(MAKE) -C $(LDIR) BUILDMODE=static
62+
@$(MAKE) -C $(LDIR) BUILDMODE=static XCFLAGS=-DLUAJIT_ENABLE_GC64
6363

6464
.PHONY: all clean
6565
.SUFFIXES:

Diff for: ‎deps/luajit/COPYRIGHT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
===============================================================================
22
LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
33

4-
Copyright (C) 2005-2014 Mike Pall. All rights reserved.
4+
Copyright (C) 2005-2017 Mike Pall. All rights reserved.
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

Diff for: ‎deps/luajit/Makefile

+35-20
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
# For MSVC, please follow the instructions given in src/msvcbuild.bat.
1111
# For MinGW and Cygwin, cd to src and run make with the Makefile there.
1212
#
13-
# Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
13+
# Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
1414
##############################################################################
1515

1616
MAJVER= 2
17-
MINVER= 0
18-
RELVER= 3
19-
VERSION= $(MAJVER).$(MINVER).$(RELVER)
17+
MINVER= 1
18+
RELVER= 0
19+
PREREL= -beta3
20+
VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
2021
ABIVER= 5.1
2122

2223
##############################################################################
@@ -46,17 +47,18 @@ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
4647
INSTALL_TNAME= luajit-$(VERSION)
4748
INSTALL_TSYMNAME= luajit
4849
INSTALL_ANAME= libluajit-$(ABIVER).a
49-
INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
50-
INSTALL_SOSHORT= libluajit-$(ABIVER).so
51-
INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
50+
INSTALL_SOSHORT1= libluajit-$(ABIVER).so
51+
INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER)
52+
INSTALL_SONAME= $(INSTALL_SOSHORT2).$(MINVER).$(RELVER)
5253
INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
5354
INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
55+
INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
5456
INSTALL_PCNAME= luajit.pc
5557

5658
INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
5759
INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME)
58-
INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
59-
INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
60+
INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1)
61+
INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
6062
INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
6163
INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
6264
INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
@@ -83,16 +85,23 @@ FILE_SO= libluajit.so
8385
FILE_MAN= luajit.1
8486
FILE_PC= luajit.pc
8587
FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h
86-
FILES_JITLIB= bc.lua v.lua dump.lua dis_x86.lua dis_x64.lua dis_arm.lua \
87-
dis_ppc.lua dis_mips.lua dis_mipsel.lua bcsave.lua vmdef.lua
88+
FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
89+
dis_x86.lua dis_x64.lua dis_arm.lua dis_arm64.lua \
90+
dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
91+
dis_mips64.lua dis_mips64el.lua vmdef.lua
8892

8993
ifeq (,$(findstring Windows,$(OS)))
90-
ifeq (Darwin,$(shell uname -s))
91-
INSTALL_SONAME= $(INSTALL_DYLIBNAME)
92-
INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT1)
93-
INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT2)
94-
LDCONFIG= :
95-
endif
94+
HOST_SYS:= $(shell uname -s)
95+
else
96+
HOST_SYS= Windows
97+
endif
98+
TARGET_SYS?= $(HOST_SYS)
99+
100+
ifeq (Darwin,$(TARGET_SYS))
101+
INSTALL_SONAME= $(INSTALL_DYLIBNAME)
102+
INSTALL_SOSHORT1= $(INSTALL_DYLIBSHORT1)
103+
INSTALL_SOSHORT2= $(INSTALL_DYLIBSHORT2)
104+
LDCONFIG= :
96105
endif
97106

98107
##############################################################################
@@ -109,7 +118,7 @@ install: $(INSTALL_DEP)
109118
$(MKDIR) $(INSTALL_DIRS)
110119
cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
111120
cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || :
112-
$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
121+
$(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
113122
cd src && test -f $(FILE_SO) && \
114123
$(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
115124
$(LDCONFIG) $(INSTALL_LIB) && \
@@ -121,12 +130,18 @@ install: $(INSTALL_DEP)
121130
$(RM) $(FILE_PC).tmp
122131
cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
123132
cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
124-
$(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
125133
@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
134+
@echo ""
135+
@echo "Note: the development releases deliberately do NOT install a symlink for luajit"
136+
@echo "You can do this now by running this command (with sudo):"
137+
@echo ""
138+
@echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
139+
@echo ""
140+
126141

127142
uninstall:
128143
@echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
129-
$(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC)
144+
$(UNINSTALL) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC)
130145
for file in $(FILES_JITLIB); do \
131146
$(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
132147
done

Diff for: ‎deps/luajit/README

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
README for LuaJIT 2.0.3
2-
-----------------------
1+
README for LuaJIT 2.1.0-beta3
2+
-----------------------------
33

44
LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.
55

66
Project Homepage: http://luajit.org/
77

8-
LuaJIT is Copyright (C) 2005-2014 Mike Pall.
8+
LuaJIT is Copyright (C) 2005-2017 Mike Pall.
99
LuaJIT is free software, released under the MIT license.
1010
See full Copyright Notice in the COPYRIGHT file or in luajit.h.
1111

Diff for: ‎deps/luajit/doc/bluequad-print.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2004-2014 Mike Pall.
1+
/* Copyright (C) 2004-2017 Mike Pall.
22
*
33
* You are welcome to use the general ideas of this design for your own sites.
44
* But please do not steal the stylesheet, the layout or the color scheme.

Diff for: ‎deps/luajit/doc/bluequad.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2004-2014 Mike Pall.
1+
/* Copyright (C) 2004-2017 Mike Pall.
22
*
33
* You are welcome to use the general ideas of this design for your own sites.
44
* But please do not steal the stylesheet, the layout or the color scheme.

0 commit comments

Comments
 (0)