--- a/make/autoconf/flags-ldflags.m4 Wed Sep 19 19:12:20 2018 +0200
+++ b/make/autoconf/flags-ldflags.m4 Wed Sep 19 10:51:06 2018 -0700
@@ -74,10 +74,8 @@
# Add -z defs, to forbid undefined symbols in object files.
BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,defs"
- BASIC_LDFLAGS_JVM_ONLY="-Wl,-z,noexecstack -Wl,-O1 -Wl,-z,relro"
+ BASIC_LDFLAGS_JVM_ONLY="-Wl,-O1 -Wl,-z,relro"
- BASIC_LDFLAGS_JDK_LIB_ONLY="-Wl,-z,noexecstack"
- LIBJSIG_NOEXECSTACK_LDFLAGS="-Wl,-z,noexecstack"
elif test "x$TOOLCHAIN_TYPE" = xclang; then
BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
@@ -103,6 +101,12 @@
BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
fi
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+ if test -n "$HAS_NOEXECSTACK"; then
+ BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,noexecstack"
+ fi
+ fi
+
# Setup OS-dependent LDFLAGS
if test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xgcc; then
if test "x$OPENJDK_TARGET_OS" = xmacosx; then