--- a/make/autoconf/flags-ldflags.m4 Thu Sep 20 21:47:13 2018 +0200
+++ b/make/autoconf/flags-ldflags.m4 Thu Sep 20 22:01:12 2018 +0200
@@ -51,9 +51,7 @@
FLAGS_SETUP_LDFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
- LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB"
- LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE ${TARGET_LDFLAGS_JDK_LIBPATH}"
- AC_SUBST(LDFLAGS_TESTLIB)
+ LDFLAGS_TESTEXE="${TARGET_LDFLAGS_JDK_LIBPATH}"
AC_SUBST(LDFLAGS_TESTEXE)
])
@@ -74,14 +72,12 @@
# 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 \
- -stdlib=libc++ -fPIC"
+ -fPIC"
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
BASIC_LDFLAGS="-Wl,-z,defs"
@@ -94,7 +90,8 @@
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
BASIC_LDFLAGS="-b64 -brtl -bnolibpath -bexpall -bernotok -btextpsize:64K \
-bdatapsize:64K -bstackpsize:64K"
- BASIC_LDFLAGS_JVM_ONLY="-Wl,-lC_r"
+ # libjvm.so has gotten too large for normal TOC size; compile with qpic=large and link with bigtoc
+ BASIC_LDFLAGS_JVM_ONLY="-Wl,-lC_r -bbigtoc"
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
BASIC_LDFLAGS="-nologo -opt:ref"
@@ -102,6 +99,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