From 04a517ad2734fb7357924f082f479c63ae4c4f49 Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Tue, 21 Jan 2014 11:51:16 -0200
Subject: [PATCH] Pull latest fixes from LuaJIT repository

and change its build to an amalgamated build (potentially more performance)
---
 Makefile   | 2 +-
 luajit-2.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 66dacac32..31ff25556 100644
--- 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
index ef59e5482..92475419e 160000
--- a/luajit-2.0
+++ b/luajit-2.0
@@ -1 +1 @@
-Subproject commit ef59e5482055ed4477144518fc79a993288e855b
+Subproject commit 92475419e5cc5e61c5feb6a0fe549b1fc4a9d7cf