From 0ad4078cd604797eec4b8922f169da5c2a1a16d3 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 4 May 2018 14:06:44 +0200 Subject: Configure: move --noexecstack probe to Configure. config probe doesn't work in cross-compile scenarios or with clang. In addition consolidate -Qunused-arguments handling. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/6174) --- config | 8 -------- 1 file changed, 8 deletions(-) (limited to 'config') diff --git a/config b/config index a44cd21e93..b8adf34999 100755 --- a/config +++ b/config @@ -840,14 +840,6 @@ if [ -n "$CONFIG_OPTIONS" ]; then options="$options $CONFIG_OPTIONS" fi -if expr "$options" : '.*no\-asm' > /dev/null; then :; else - if sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \ - grep \\--noexecstack >/dev/null; then - __CNF_CFLAGS="$__CNF_CFLAGS -Wa,--noexecstack" - __CNF_CXXFLAGS="$__CNF_CXXFLAGS -Wa,--noexecstack" - fi -fi - # gcc < 2.8 does not support -march=ultrasparc if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] then -- cgit v1.2.1