1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/openssl/config b/crypto/openssl/config
index b9d1c7aa2688..7a958cb43265 100755
--- a/crypto/openssl/config
+++ b/crypto/openssl/config
@@ -790,6 +790,10 @@ esac
 #  options="$options -DATALLA"
 #fi
 
+($CC -Wa,--help -c -o /dev/null -x assembler /dev/null 2>&1 | \
+ grep \\--noexecstack) 2>&1 > /dev/null && \
+  options="$options -Wa,--noexecstack"
+
 # gcc < 2.8 does not support -march=ultrasparc
 if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
 then