# HG changeset patch # User ihse # Date 1519046380 -3600 # Node ID 37625ab20ec70d8a2ff34272df9a167f9c78fdfa # Parent 0a4dbc2c7ed1333dc4992fbd8d4f6e366ceeae2e Move LDFLAGS handling to flags-ldflags.m4. diff -r 0a4dbc2c7ed1 -r 37625ab20ec7 make/autoconf/flags-ldflags.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/autoconf/flags-ldflags.m4 Mon Feb 19 14:19:40 2018 +0100 @@ -0,0 +1,206 @@ +# +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +################################################################################ +# + +AC_DEFUN([FLAGS_SETUP_LINKER_FLAGS_FOR_JDK], +[ + ### LINKER + ### COMMON LINKER FLAGS + FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_HELPER + + # TARGET CHAIN + # On some platforms (mac) the linker warns about non existing -L dirs. + # For any of the variants server, client or minimal, the dir matches the + # variant name. The "main" variant should be used for linking. For the + # rest, the dir is just server. + if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \ + || HOTSPOT_CHECK_JVM_VARIANT(minimal); then + TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN + else + TARGET_JVM_VARIANT_PATH=server + fi + FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP([TARGET]) + + # BUILD CHAIN + + # When building a buildjdk, it's always only the server variant + BUILD_JVM_VARIANT_PATH=server + + FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP([BUILD], [OPENJDK_BUILD_]) + + LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" + LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE ${TARGET_LDFLAGS_JDK_LIBPATH}" + AC_SUBST(LDFLAGS_TESTLIB) + AC_SUBST(LDFLAGS_TESTEXE) +]) + +################################################################################ + +# CPU independent +AC_DEFUN([FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_HELPER], +[ + # BASIC_LDFLAGS (per toolchain) + if test "x$TOOLCHAIN_TYPE" = xgcc; then + # If this is a --hash-style=gnu system, use --hash-style=both, why? + # We have previously set HAS_GNU_HASH if this is the case + if test -n "$HAS_GNU_HASH"; then + BASIC_LDFLAGS="-Wl,--hash-style=both" + LIBJSIG_HASHSTYLE_LDFLAGS="-Wl,--hash-style=both" + fi + + # And since we now know that the linker is gnu, then 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" + + BASIC_LDFLAGS_JDK_LIB_ONLY="-Wl,-z,noexecstack" + LIBJSIG_NOEXECSTACK_LDFLAGS="-Wl,-z,noexecstack" + + + if test "x$HAS_LINKER_RELRO" = "xtrue"; then + BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY $LINKER_RELRO_FLAG" + fi + + elif test "x$TOOLCHAIN_TYPE" = xclang; then + BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 -stdlib=libstdc++ -fPIC" + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then + BASIC_LDFLAGS="-Wl,-z,defs" + BASIC_LDFLAGS_ONLYCXX="-norunpath" + BASIC_LDFLAGS_ONLYCXX_JDK_ONLY="-xnolib" + + BASIC_LDFLAGS_JDK_ONLY="-ztext" + BASIC_LDFLAGS_JVM_ONLY="-library=%none -mt -z noversion" + 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" + elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then + BASIC_LDFLAGS="-nologo -opt:ref" + BASIC_LDFLAGS_JDK_ONLY="-incremental:no" + BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows -base:0x8000000" + fi + + # OS_LDFLAGS (per toolchain) + if test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xgcc; then + if test "x$OPENJDK_TARGET_OS" = xmacosx; then + # Assume clang or gcc. + # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead. + OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.." + OS_LDFLAGS_JDK_ONLY="-mmacosx-version-min=\$(MACOSX_VERSION_MIN)" + fi + fi + + # DEBUGLEVEL_LDFLAGS (per toolchain) + if test "x$TOOLCHAIN_TYPE" = xgcc; then + if test "x$OPENJDK_TARGET_OS" = xlinux; then + if test x$DEBUG_LEVEL = xrelease; then + DEBUGLEVEL_LDFLAGS_JDK_ONLY="$DEBUGLEVEL_LDFLAGS_JDK_ONLY -Wl,-O1" + else + # mark relocations read only on (fast/slow) debug builds + if test "x$HAS_LINKER_RELRO" = "xtrue"; then + DEBUGLEVEL_LDFLAGS_JDK_ONLY="$LINKER_RELRO_FLAG" + fi + fi + if test x$DEBUG_LEVEL = xslowdebug; then + if test "x$HAS_LINKER_NOW" = "xtrue"; then + # do relocations at load + DEBUGLEVEL_LDFLAGS="$LINKER_NOW_FLAG" + fi + fi + fi + elif test "x$TOOLCHAIN_TYPE" = xxlc; then + # We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows. + # Hotspot now overflows its 64K TOC (currently only for debug), + # so we build with '-qpic=large -bbigtoc'. + if test "x$DEBUG_LEVEL" != xrelease; then + DEBUGLEVEL_LDFLAGS_JVM_ONLY="$DEBUGLEVEL_LDFLAGS_JVM_ONLY -bbigtoc" + fi + fi + + # EXECUTABLE_LDFLAGS (per toolchain) + if test "x$TOOLCHAIN_TYPE" = xgcc; then + EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined" + fi + + # EXPORT to old api + LDFLAGS_CXX_JDK="$BASIC_LDFLAGS_ONLYCXX $BASIC_LDFLAGS_ONLYCXX_JDK_ONLY" + AC_SUBST(LDFLAGS_CXX_JDK) + AC_SUBST(LIBJSIG_HASHSTYLE_LDFLAGS) + AC_SUBST(LIBJSIG_NOEXECSTACK_LDFLAGS) +]) + +################################################################################ +# $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check +# conditionals against. +# $2 - Optional prefix for each variable defined. +AC_DEFUN([FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP], +[ + # CPU_LDFLAGS (per toolchain) + # These can differ between TARGET and BUILD. + if test "x$TOOLCHAIN_TYPE" = xgcc; then + if test "x${OPENJDK_$1_CPU}" = xx86; then + $1_CPU_LDFLAGS_JVM_ONLY="-march=i586" + fi + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then + if test "x${OPENJDK_$1_CPU}" = "xsparcv9"; then + $1_CPU_LDFLAGS_JVM_ONLY="-xarch=sparc" + fi + elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then + if test "x${OPENJDK_$1_CPU}" = "xx86"; then + $1_CPU_LDFLAGS="-safeseh" + # NOTE: Old build added -machine. Probably not needed. + $1_CPU_LDFLAGS_JVM_ONLY="-machine:I386" + LDFLAGS_STACK_SIZE=327680 + else + $1_CPU_LDFLAGS_JVM_ONLY="-machine:AMD64" + LDFLAGS_STACK_SIZE=1048576 + fi + $1_CPU_EXECUTABLE_LDFLAGS="-stack:$LDFLAGS_STACK_SIZE" + fi + + # JVM_VARIANT_PATH depends on if this is build or target... + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then + $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base" + else + $1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \ + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}" + fi + + # Export to old API, prefix with $2 if present + LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY $OS_LDFLAGS_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY" + $2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY ${$1_LDFLAGS_JDK_LIBPATH}" + $2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS ${$1_CPU_EXECUTABLE_LDFLAGS}" + + $2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS_JVM_ONLY \ + $DEBUGLEVEL_LDFLAGS $DEBUGLEVEL_LDFLAGS_JVM_ONLY $BASIC_LDFLAGS_ONLYCXX \ + ${$1_CPU_LDFLAGS} ${$1_CPU_LDFLAGS_JVM_ONLY}" + + AC_SUBST($2LDFLAGS_JDKLIB) + AC_SUBST($2LDFLAGS_JDKEXE) + + AC_SUBST($2JVM_LDFLAGS) +]) diff -r 0a4dbc2c7ed1 -r 37625ab20ec7 make/autoconf/flags.m4 --- a/make/autoconf/flags.m4 Mon Feb 19 14:14:59 2018 +0100 +++ b/make/autoconf/flags.m4 Mon Feb 19 14:19:40 2018 +0100 @@ -23,6 +23,8 @@ # questions. # +m4_include([flags-ldflags.m4]) + ################################################################################ # # Setup ABI profile (for arm) @@ -367,36 +369,7 @@ fi LIBS="$save_LIBS" - ### LINKER - ### COMMON LINKER FLAGS - FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_HELPER - - # TARGET CHAIN - # On some platforms (mac) the linker warns about non existing -L dirs. - # For any of the variants server, client or minimal, the dir matches the - # variant name. The "main" variant should be used for linking. For the - # rest, the dir is just server. - if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \ - || HOTSPOT_CHECK_JVM_VARIANT(minimal); then - TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN - else - TARGET_JVM_VARIANT_PATH=server - fi - FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP([TARGET]) - - # BUILD CHAIN - - # When building a buildjdk, it's always only the server variant - BUILD_JVM_VARIANT_PATH=server - - FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP([BUILD], [OPENJDK_BUILD_]) - - LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" - LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE ${TARGET_LDFLAGS_JDK_LIBPATH}" - AC_SUBST(LDFLAGS_TESTLIB) - AC_SUBST(LDFLAGS_TESTEXE) - - + FLAGS_SETUP_LINKER_FLAGS_FOR_JDK ### CFLAGS @@ -856,154 +829,6 @@ ]) -############## LINKER ############################ - -# CPU independent -AC_DEFUN([FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_HELPER], -[ - # BASIC_LDFLAGS (per toolchain) - if test "x$TOOLCHAIN_TYPE" = xgcc; then - # If this is a --hash-style=gnu system, use --hash-style=both, why? - # We have previously set HAS_GNU_HASH if this is the case - if test -n "$HAS_GNU_HASH"; then - BASIC_LDFLAGS="-Wl,--hash-style=both" - LIBJSIG_HASHSTYLE_LDFLAGS="-Wl,--hash-style=both" - fi - - # And since we now know that the linker is gnu, then 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" - - BASIC_LDFLAGS_JDK_LIB_ONLY="-Wl,-z,noexecstack" - LIBJSIG_NOEXECSTACK_LDFLAGS="-Wl,-z,noexecstack" - - - if test "x$HAS_LINKER_RELRO" = "xtrue"; then - BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY $LINKER_RELRO_FLAG" - fi - - elif test "x$TOOLCHAIN_TYPE" = xclang; then - BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 -stdlib=libstdc++ -fPIC" - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then - BASIC_LDFLAGS="-Wl,-z,defs" - BASIC_LDFLAGS_ONLYCXX="-norunpath" - BASIC_LDFLAGS_ONLYCXX_JDK_ONLY="-xnolib" - - BASIC_LDFLAGS_JDK_ONLY="-ztext" - BASIC_LDFLAGS_JVM_ONLY="-library=%none -mt -z noversion" - 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" - elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then - BASIC_LDFLAGS="-nologo -opt:ref" - BASIC_LDFLAGS_JDK_ONLY="-incremental:no" - BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows -base:0x8000000" - fi - - # OS_LDFLAGS (per toolchain) - if test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xgcc; then - if test "x$OPENJDK_TARGET_OS" = xmacosx; then - # Assume clang or gcc. - # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead. - OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.." - OS_LDFLAGS_JDK_ONLY="-mmacosx-version-min=\$(MACOSX_VERSION_MIN)" - fi - fi - - # DEBUGLEVEL_LDFLAGS (per toolchain) - if test "x$TOOLCHAIN_TYPE" = xgcc; then - if test "x$OPENJDK_TARGET_OS" = xlinux; then - if test x$DEBUG_LEVEL = xrelease; then - DEBUGLEVEL_LDFLAGS_JDK_ONLY="$DEBUGLEVEL_LDFLAGS_JDK_ONLY -Wl,-O1" - else - # mark relocations read only on (fast/slow) debug builds - if test "x$HAS_LINKER_RELRO" = "xtrue"; then - DEBUGLEVEL_LDFLAGS_JDK_ONLY="$LINKER_RELRO_FLAG" - fi - fi - if test x$DEBUG_LEVEL = xslowdebug; then - if test "x$HAS_LINKER_NOW" = "xtrue"; then - # do relocations at load - DEBUGLEVEL_LDFLAGS="$LINKER_NOW_FLAG" - fi - fi - fi - elif test "x$TOOLCHAIN_TYPE" = xxlc; then - # We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows. - # Hotspot now overflows its 64K TOC (currently only for debug), - # so we build with '-qpic=large -bbigtoc'. - if test "x$DEBUG_LEVEL" != xrelease; then - DEBUGLEVEL_LDFLAGS_JVM_ONLY="$DEBUGLEVEL_LDFLAGS_JVM_ONLY -bbigtoc" - fi - fi - - # EXECUTABLE_LDFLAGS (per toolchain) - if test "x$TOOLCHAIN_TYPE" = xgcc; then - EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined" - fi - - # EXPORT to old api - LDFLAGS_CXX_JDK="$BASIC_LDFLAGS_ONLYCXX $BASIC_LDFLAGS_ONLYCXX_JDK_ONLY" - AC_SUBST(LDFLAGS_CXX_JDK) - AC_SUBST(LIBJSIG_HASHSTYLE_LDFLAGS) - AC_SUBST(LIBJSIG_NOEXECSTACK_LDFLAGS) -]) - -################################################################################ -# $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check -# conditionals against. -# $2 - Optional prefix for each variable defined. -AC_DEFUN([FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP], -[ - # CPU_LDFLAGS (per toolchain) - # These can differ between TARGET and BUILD. - if test "x$TOOLCHAIN_TYPE" = xgcc; then - if test "x${OPENJDK_$1_CPU}" = xx86; then - $1_CPU_LDFLAGS_JVM_ONLY="-march=i586" - fi - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then - if test "x${OPENJDK_$1_CPU}" = "xsparcv9"; then - $1_CPU_LDFLAGS_JVM_ONLY="-xarch=sparc" - fi - elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then - if test "x${OPENJDK_$1_CPU}" = "xx86"; then - $1_CPU_LDFLAGS="-safeseh" - # NOTE: Old build added -machine. Probably not needed. - $1_CPU_LDFLAGS_JVM_ONLY="-machine:I386" - LDFLAGS_STACK_SIZE=327680 - else - $1_CPU_LDFLAGS_JVM_ONLY="-machine:AMD64" - LDFLAGS_STACK_SIZE=1048576 - fi - $1_CPU_EXECUTABLE_LDFLAGS="-stack:$LDFLAGS_STACK_SIZE" - fi - - # JVM_VARIANT_PATH depends on if this is build or target... - if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then - $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base" - else - $1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \ - -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}" - fi - - # Export to old API, prefix with $2 if present - LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY $OS_LDFLAGS_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY" - $2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY ${$1_LDFLAGS_JDK_LIBPATH}" - $2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS ${$1_CPU_EXECUTABLE_LDFLAGS}" - - $2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS_JVM_ONLY \ - $DEBUGLEVEL_LDFLAGS $DEBUGLEVEL_LDFLAGS_JVM_ONLY $BASIC_LDFLAGS_ONLYCXX \ - ${$1_CPU_LDFLAGS} ${$1_CPU_LDFLAGS_JVM_ONLY}" - - AC_SUBST($2LDFLAGS_JDKLIB) - AC_SUBST($2LDFLAGS_JDKEXE) - - AC_SUBST($2JVM_LDFLAGS) -]) - - # FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE], # IF_FALSE: [RUN-IF-FALSE]) # ------------------------------------------------------------