diff options
| author | Luigi Scarso <luigi.scarso@gmail.com> | 2018-02-06 15:27:32 +0000 |
|---|---|---|
| committer | Luigi Scarso <luigi.scarso@gmail.com> | 2018-02-06 15:27:32 +0000 |
| commit | 7ce484f314ab1fcba2367c2c3ff88347ed183252 (patch) | |
| tree | 8d429a9013472808fe9d2edd228d9a053731df2b | |
| parent | 5234a0531a6ae91d4009e4deaf966c8c432aed4c (diff) | |
luajit: added missed endianness flags to dynasm.
git-svn-id: svn://tug.org/texlive/trunk@46554 c570f23f-e606-0410-a88d-b1316a301751
| -rwxr-xr-x | Build/source/libs/luajit/configure | 9 | ||||
| -rw-r--r-- | Build/source/libs/luajit/m4/lj-system.m4 | 11 |
2 files changed, 18 insertions, 2 deletions
diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure index b8a59596a24..086a2fc6e6a 100755 --- a/Build/source/libs/luajit/configure +++ b/Build/source/libs/luajit/configure @@ -14206,6 +14206,10 @@ elif grep 'LJ_TARGET_ARM64 ' conftest.i >/dev/null 2>&1; then : if test "x$LJHOST" = xiOS; then : LUAJIT_CFLAGS='-fno-omit-frame-pointer' fi + if grep '__AARCH64EB__' conftest.i >/dev/null 2>&1; then : + echo '-D__AARCH64EB__=1' >>native_flags +fi + elif grep 'LJ_TARGET_PPC ' conftest.i >/dev/null 2>&1; then : LJARCH=ppc if grep 'LJ_LE 1' conftest.i >/dev/null 2>&1; then : @@ -14231,6 +14235,11 @@ if grep 'LJ_NO_UNWIND 1' conftest.i >/dev/null 2>&1; then : echo '-DLUAJIT_NO_UNWIND' >>native_flags fi echo "-DLUAJIT_TARGET=LUAJIT_ARCH_$LJARCH" >>native_flags +if grep 'LJ_LE' conftest.i >/dev/null 2>&1; then : + echo '-D ENDIAN_LE' >>dynasm_flags +else + echo '-D ENDIAN_BE' >>dynasm_flags +fi if grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1; then : echo '-D P64' >>dynasm_flags if test "x$LJHOST" = xLinux; then : diff --git a/Build/source/libs/luajit/m4/lj-system.m4 b/Build/source/libs/luajit/m4/lj-system.m4 index cd2fc9a2e1e..73ba282af84 100644 --- a/Build/source/libs/luajit/m4/lj-system.m4 +++ b/Build/source/libs/luajit/m4/lj-system.m4 @@ -5,6 +5,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. + # _LJ_ARCH # -------- # Internal subroutine. @@ -22,9 +23,12 @@ AS_IF([grep 'LJ_TARGET_X64 ' conftest.i >/dev/null 2>&1], [grep 'LJ_TARGET_ARM ' conftest.i >/dev/null 2>&1], [LJARCH=arm], [grep 'LJ_TARGET_ARM64 ' conftest.i >/dev/null 2>&1], - [LJARCH=arm64 + [LJARCH=arm64 AS_IF([test "x$LJHOST" = xiOS], - [LUAJIT_CFLAGS='-fno-omit-frame-pointer'])], + [LUAJIT_CFLAGS='-fno-omit-frame-pointer']) + AS_IF([grep '__AARCH64EB__' conftest.i >/dev/null 2>&1], + [echo '-D__AARCH64EB__=1' >>native_flags]) + ], [grep 'LJ_TARGET_PPC ' conftest.i >/dev/null 2>&1], [LJARCH=ppc AS_IF([grep 'LJ_LE 1' conftest.i >/dev/null 2>&1], @@ -43,6 +47,9 @@ AS_IF([grep 'LJ_NO_UNWIND 1' conftest.i >/dev/null 2>&1], [echo '-D NO_UNWIND' >>dynasm_flags echo '-DLUAJIT_NO_UNWIND' >>native_flags]) echo "-DLUAJIT_TARGET=LUAJIT_ARCH_$LJARCH" >>native_flags +AS_IF([grep 'LJ_LE' conftest.i >/dev/null 2>&1], + [echo '-D ENDIAN_LE' >>dynasm_flags], + [echo '-D ENDIAN_BE' >>dynasm_flags]) AS_IF([grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1], [echo '-D P64' >>dynasm_flags AS_IF([test "x$LJHOST" = xLinux], |