Pull latest fixes from LuaJIT repository

and change its build to an amalgamated build (potentially more performance)
koreader · Jan 21, 2014 · 04a517a · 04a517a
1 parent 648b47e
commit 04a517a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -143,7 +143,7 @@ else
 		CFLAGS="$(BASE_CFLAGS)" HOST_CFLAGS="$(HOSTCFLAGS)" \
 		TARGET_CFLAGS="$(CFLAGS)" \
 		TARGET_FLAGS="-DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2" \
-		CROSS="$(strip $(CCACHE) $(CHOST))-"
+		CROSS="$(strip $(CCACHE) $(CHOST))-" amalg
 endif
 	# special case: LuaJIT compiles a libluajit.so, which must be named
 	# differently when installing

diff --git a/luajit-2.0 b/luajit-2.0