summaryrefslogtreecommitdiff
path: root/Build/source/libs/luajit/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-09-28 08:44:01 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-09-28 08:44:01 +0000
commita7c63a2257f4923220afa43b88f7d5950abf0c80 (patch)
tree9ad0e693734e8af6f2022ccdf77f43a144a0e76b /Build/source/libs/luajit/configure
parent300e9a57f1d8f94c6437fb988f1e3b41d33600ee (diff)
libs/luajit: Try to fix it for NetBSD/amd64
git-svn-id: svn://tug.org/texlive/trunk@38487 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/luajit/configure')
-rwxr-xr-xBuild/source/libs/luajit/configure19
1 files changed, 17 insertions, 2 deletions
diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure
index 84b03b5d68c..53a0f24c9c5 100755
--- a/Build/source/libs/luajit/configure
+++ b/Build/source/libs/luajit/configure
@@ -14144,15 +14144,19 @@ if ac_fn_c_try_cpp "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for architecture" >&5
$as_echo_n "checking for architecture... " >&6; }
cp conftest.i system_flags
+LUAJIT_CFLAGS='-fomit-frame-pointer'
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 :
LJARCH=x86
- LUAJIT_CFLAGS='-march=i686 -msse -msse2 -mfpmath=sse'
+ LUAJIT_CFLAGS="$LUAJIT_CFLAGS -march=i686 -msse -msse2 -mfpmath=sse"
elif grep 'LJ_TARGET_ARM ' conftest.i >/dev/null 2>&1; then :
LJARCH=arm
elif grep 'LJ_TARGET_ARM64 ' conftest.i >/dev/null 2>&1; then :
LJARCH=arm64
+ if test "x$LJHOST" = xiOS; then :
+ LUAJIT_CFLAGS='-fno-omit-frame-pointer'
+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 :
@@ -14263,12 +14267,23 @@ CPPFLAGS=$lj_save_CPPFLAGS
case $LJHOST in #(
Windows) :
LJVM_MODE=peobj
- LUAJIT_CFLAGS=-malign-double ;; #(
+ LUAJIT_CFLAGS="$LUAJIT_CFLAGS -malign-double" ;; #(
Darwin | iOS) :
LJVM_MODE=machasm ;; #(
*) :
LJVM_MODE=elfasm ;;
esac
+lj_save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -fno-stack-protector"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ LUAJIT_CFLAGS="$LUAJIT_CFLAGS -fno-stack-protector"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS=$lj_save_CFLAGS
if test "x$LJVM_MODE" = xpeobj; then
PEOBJ_TRUE=
PEOBJ_FALSE='#'