diff options
Diffstat (limited to 'sysdeps/i386/configure')
-rw-r--r-- | sysdeps/i386/configure | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index 9515719daa..90c63caf35 100644 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -26,7 +26,7 @@ libc_compiler_builtin_inlined=no cat > conftest.c <<EOF int _start (void) { int a, b, c; __sync_val_compare_and_swap (&a, b, c); return 0; } EOF -if ! { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS +if ! { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp -O0 -nostdlib -nostartfiles -S conftest.c -o - | fgrep "__sync_val_compare_and_swap" 1>&5' @@ -50,6 +50,39 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_compiler_builtin_inlined" >&5 $as_echo "$libc_compiler_builtin_inlined" >&6; } +if test "$static_pie" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker static PIE support" >&5 +$as_echo_n "checking for linker static PIE support... " >&6; } +if ${libc_cv_ld_static_pie+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat > conftest.s <<\EOF + .text + .global _start +_start: + movl _start@GOT(%ebx), %eax +EOF + libc_cv_pie_option="-Wl,-pie" + libc_cv_ld_static_pie=no + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostartfiles -nostdlib $no_ssp $libc_cv_pie_option -o conftest conftest.s 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + if $READELF -r conftest | grep 'There are no relocations in this file.' > /dev/null; then + libc_cv_ld_static_pie=yes + fi + fi +rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ld_static_pie" >&5 +$as_echo "$libc_cv_ld_static_pie" >&6; } + if test "$libc_cv_ld_static_pie" != yes; then + as_fn_error $? "linker support for static PIE needed" "$LINENO" 5 + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Intel MPX support" >&5 $as_echo_n "checking for Intel MPX support... " >&6; } if ${libc_cv_asm_mpx+:} false; then : @@ -72,13 +105,15 @@ rm -f conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_mpx" >&5 $as_echo "$libc_cv_asm_mpx" >&6; } -if test $libc_cv_asm_mpx == yes; then +if test $libc_cv_asm_mpx = yes; then $as_echo "#define HAVE_MPX_SUPPORT 1" >>confdefs.h fi -$as_echo "#define USE_REGPARMS 1" >>confdefs.h +$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h -$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h +if test x"$multi_arch" != xno; then + $as_echo "#define NO_HIDDEN_EXTERN_FUNC_IN_PIE 1" >>confdefs.h +fi |