libs/luajit: Keep preprocessed file for better diagnostics

git-svn-id: svn://tug.org/texlive/trunk@38330 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 9 insertions, 8 deletions

diff --git a/Build/source/libs/luajit/ChangeLog b/Build/source/libs/luajit/ChangeLog
index ddf72b85fd1..0d821f1cb6c 100644
--- a/Build/source/libs/luajit/ChangeLog
+++ b/Build/source/libs/luajit/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am, m4/lj-system.m4: Keep preprocessed src/lj_arch.h
+	as system_flags for better diagnostics.
+
 2015-09-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import LuaJIT-2.1.0-beta1.
diff --git a/Build/source/libs/luajit/Makefile.am b/Build/source/libs/luajit/Makefile.am
index febddb72941..1eb62020492 100644
--- a/Build/source/libs/luajit/Makefile.am
+++ b/Build/source/libs/luajit/Makefile.am
@@ -144,7 +144,7 @@ $(ljlib_sources) lj_opt_fold.c: config.force
 
 CLEANFILES = $(HDRGEN) $(ljlib_sources) lj_opt_fold.c lj_vm_asm.S
 
-CONFIG_CLEAN_FILES = dynasm_flags native_flags
+CONFIG_CLEAN_FILES = dynasm_flags native_flags system_flags
 
 luajitincludedir = ${includedir}/texluajit
 
diff --git a/Build/source/libs/luajit/Makefile.in b/Build/source/libs/luajit/Makefile.in
index cc7665b5812..9c6a2cbed1d 100644
--- a/Build/source/libs/luajit/Makefile.in
+++ b/Build/source/libs/luajit/Makefile.in
@@ -731,7 +731,7 @@ ljlib_sources = \
 HDRGEN = lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
 CLEANFILES = $(HDRGEN) $(ljlib_sources) lj_opt_fold.c lj_vm_asm.S \
 	jiterr.out jiterr.tmp rebuild.stamp
-CONFIG_CLEAN_FILES = dynasm_flags native_flags
+CONFIG_CLEAN_FILES = dynasm_flags native_flags system_flags
 luajitincludedir = ${includedir}/texluajit
 luajitinclude_HEADERS = \
 	$(LUAJIT_TREE)/src/lauxlib.h \
diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure
index ecf9dcba945..84b03b5d68c 100755
--- a/Build/source/libs/luajit/configure
+++ b/Build/source/libs/luajit/configure
@@ -14143,6 +14143,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
   lj_cpp=ok; rm -f dynasm_flags native_flags
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for architecture" >&5
 $as_echo_n "checking for architecture... " >&6; }
+cp conftest.i system_flags
 if grep 'LJ_TARGET_X64 ' conftest.i >/dev/null 2>&1; then :
   LJARCH=x64
 elif grep 'LJ_TARGET_X86 ' conftest.i >/dev/null 2>&1; then :
@@ -14211,10 +14212,6 @@ if test "x$LJHOST" = xWindows; then :
 fi
 DASM_ARCH=$LJARCH
 case $LJARCH in #(
-  x86) :
-    if grep '__SSE2__ 1' conftest.i >/dev/null 2>&1; then :
-  echo '-D SSE' >>dynasm_flags
-fi ;; #(
   x64) :
     if grep 'LJ_FR2 1' conftest.i >/dev/null 2>&1; then :
 
diff --git a/Build/source/libs/luajit/m4/lj-system.m4 b/Build/source/libs/luajit/m4/lj-system.m4
index 768458c88a1..5f0d164af80 100644
--- a/Build/source/libs/luajit/m4/lj-system.m4
+++ b/Build/source/libs/luajit/m4/lj-system.m4
@@ -12,6 +12,7 @@
 m4_define([_LJ_ARCH], [dnl
 rm -f dynasm_flags native_flags
 AC_MSG_CHECKING([for architecture])
+cp conftest.i system_flags
 AS_IF([grep 'LJ_TARGET_X64 ' conftest.i >/dev/null 2>&1],
         [LJARCH=x64],
       [grep 'LJ_TARGET_X86 ' conftest.i >/dev/null 2>&1],
@@ -63,8 +64,6 @@ AS_IF([test "x$LJHOST" = xWindows],
       [echo '-D WIN' >>dynasm_flags])
 DASM_ARCH=$LJARCH
 AS_CASE([$LJARCH],
-        [x86], [AS_IF([grep '__SSE2__ 1' conftest.i >/dev/null 2>&1],
-                      [echo '-D SSE' >>dynasm_flags])],
         [x64], [AS_IF([grep 'LJ_FR2 1' conftest.i >/dev/null 2>&1],
                       [], [DASM_ARCH=x86])],
         [arm], [AS_IF([test "x$LJHOST" = xiOS],