aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure28
1 files changed, 12 insertions, 16 deletions
diff --git a/configure b/configure
index d2a0eb9734..4ef387146d 100755
--- a/configure
+++ b/configure
@@ -7610,9 +7610,9 @@ fi
no_fortify_source="-Wp,-U_FORTIFY_SOURCE"
fortify_source="${no_fortify_source}"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_dynamic_object_size" >&5
-printf %s "checking for __builtin_dynamic_object_size... " >&6; }
-if test ${libc_cv___builtin_dynamic_object_size+y}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for maximum supported _FORTIFY_SOURCE level" >&5
+printf %s "checking for maximum supported _FORTIFY_SOURCE level... " >&6; }
+if test ${libc_cv_supported_fortify_source+y}
then :
printf %s "(cached) " >&6
else $as_nop
@@ -7630,30 +7630,24 @@ __builtin_dynamic_object_size("", 0)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- libc_cv___builtin_dynamic_object_size=yes
- if test "$enable_fortify_source" = yes
-then :
- enable_fortify_source=3
-fi
+ libc_cv_supported_fortify_source=3
else $as_nop
- libc_cv___builtin_dynamic_object_size=no
- if test "$enable_fortify_source" = yes
-then :
- enable_fortify_source=2
-fi
+ libc_cv_supported_fortify_source=2
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv___builtin_dynamic_object_size" >&5
-printf "%s\n" "$libc_cv___builtin_dynamic_object_size" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_supported_fortify_source" >&5
+printf "%s\n" "$libc_cv_supported_fortify_source" >&6; }
case $enable_fortify_source in #(
+ yes) :
+ libc_cv_fortify_source=yes enable_fortify_source=$libc_cv_supported_fortify_source ;; #(
1|2) :
libc_cv_fortify_source=yes ;; #(
3) :
- if test "$libc_cv___builtin_dynamic_object_size" = yes
+ if test $libc_cv_supported_fortify_source = 3
then :
libc_cv_fortify_source=yes
else $as_nop
@@ -7673,6 +7667,8 @@ fi
+config_vars="$config_vars
+supported-fortify = $libc_cv_supported_fortify_source"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the assembler requires one version per symbol" >&5
printf %s "checking whether the assembler requires one version per symbol... " >&6; }