From 50e1d4f091dcc940a462769c13fcf873cc4ede52 Mon Sep 17 00:00:00 2001 From: Brian Fraser Date: Mon, 13 Jan 2014 04:22:02 -0300 Subject: [PATCH] Configure: Don't skip the alignbytes test when crosscompiling --- Configure | 71 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/Configure b/Configure index f73bdeb..cb44b33 100755 --- a/Configure +++ b/Configure @@ -19076,29 +19076,18 @@ Revision='$Revision' : check for alignment requirements echo " " -case "$usecrosscompile" in -*$define*) - $cat <&4 - if $test "X$uselongdouble" = Xdefine -a "X$d_longdbl" = Xdefine; then - $cat >try.c <<'EOCP' +case "$alignbytes" in +'') echo "Checking alignment constraints..." >&4 + if $test "X$uselongdouble" = Xdefine -a "X$d_longdbl" = Xdefine; then + $cat >try.c <<'EOCP' typedef long double NV; EOCP - else - $cat >try.c <<'EOCP' + else + $cat >try.c <<'EOCP' typedef double NV; EOCP - fi - $cat >>try.c <<'EOCP' + fi + $cat >>try.c <<'EOCP' #include struct foobar { char foo; @@ -19110,34 +19099,32 @@ int main() return(0); } EOCP - set try - if eval $compile_ok; then - dflt=`$run ./try` - else - dflt='8' - echo "(I can't seem to compile the test program...)" - fi - case "$multiarch" in + set try + if eval $compile_ok; then + dflt=`$run ./try` + else + dflt='8' + echo "(I can't seem to compile the test program...)" + fi + case "$multiarch" in *$define*) - : The usual safe value is 8, but Darwin with -Duselongdouble - : needs 16. Hence, we will take 8 as a minimum, but allow - : Configure to pick a larger value if needed. - if $test "$dflt" -lt 8; then - dflt='8' - echo "Setting alignment to 8 for multiarch support.">&4 - fi - ;; - esac - ;; - *) dflt="$alignbytes" + : The usual safe value is 8, but Darwin with -Duselongdouble + : needs 16. Hence, we will take 8 as a minimum, but allow + : Configure to pick a larger value if needed. + if $test "$dflt" -lt 8; then + dflt='8' + echo "Setting alignment to 8 for multiarch support.">&4 + fi ;; esac - rp="Doubles must be aligned on a how-many-byte boundary?" - . ./myread - alignbytes="$ans" - $rm_try + ;; +*) dflt="$alignbytes" ;; esac +rp="Doubles must be aligned on a how-many-byte boundary?" +. ./myread +alignbytes="$ans" +$rm_try : set the base revision -- 2.7.4