diff -r 89e4aea44ab9 -r 8c54aca26212 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Wed Apr 15 11:14:57 2020 +0800 +++ b/common/autoconf/generated-configure.sh Wed Apr 15 11:49:54 2020 +0800 @@ -689,6 +689,7 @@ FDLIBM_CFLAGS NO_LIFETIME_DSE_CFLAG NO_DELETE_NULL_POINTER_CHECKS_CFLAG +LEGACY_EXTRA_ASFLAGS LEGACY_EXTRA_LDFLAGS LEGACY_EXTRA_CXXFLAGS LEGACY_EXTRA_CFLAGS @@ -1088,6 +1089,7 @@ with_extra_cflags with_extra_cxxflags with_extra_ldflags +with_extra_asflags enable_debug_symbols enable_zip_debug_info with_native_debug_symbols @@ -1950,6 +1952,7 @@ --with-extra-cflags extra flags to be used when compiling jdk c-files --with-extra-cxxflags extra flags to be used when compiling jdk c++-files --with-extra-ldflags extra flags to be used when linking jdk + --with-extra-asflags extra flags to be passed to the assembler --with-native-debug-symbols set the native debug symbol configuration (none, internal, external, zipped) [varying] @@ -4385,7 +4388,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1565358475 +DATE_WHEN_GENERATED=1585090987 ############################################################################### # @@ -19797,8 +19800,6 @@ if test "x$with_cacerts_file" != x; then CACERTS_FILE=$with_cacerts_file - else - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts fi @@ -41307,6 +41308,7 @@ if test "x$TOOLCHAIN_TYPE" = xgcc; then PICFLAG="-fPIC" + PIEFLAG="-fPIE" C_FLAG_REORDER='' CXX_FLAG_REORDER='' @@ -41327,6 +41329,7 @@ fi elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then PICFLAG="-KPIC" + PIEFLAG="" C_FLAG_REORDER='-xF' CXX_FLAG_REORDER='-xF' SHARED_LIBRARY_FLAGS="-G" @@ -41336,6 +41339,7 @@ SET_SHARED_LIBRARY_MAPFILE='-M$1' elif test "x$TOOLCHAIN_TYPE" = xxlc; then PICFLAG="-qpic=large" + PIEFLAG="" C_FLAG_REORDER='' CXX_FLAG_REORDER='' SHARED_LIBRARY_FLAGS="-qmkshrobj" @@ -41345,6 +41349,7 @@ SET_SHARED_LIBRARY_MAPFILE='' elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then PICFLAG="" + PIEFLAG="" C_FLAG_REORDER='' CXX_FLAG_REORDER='' SHARED_LIBRARY_FLAGS="-LD" @@ -41571,6 +41576,12 @@ fi + if test "x$ASFLAGS" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&5 +$as_echo "$as_me: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&2;} + fi + + # Check whether --with-extra-cflags was given. if test "${with_extra_cflags+set}" = set; then : withval=$with_extra_cflags; @@ -41591,6 +41602,13 @@ fi + +# Check whether --with-extra-asflags was given. +if test "${with_extra_asflags+set}" = set; then : + withval=$with_extra_asflags; +fi + + CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags" CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" @@ -41599,6 +41617,8 @@ LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags" LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags" + LEGACY_EXTRA_ASFLAGS="$with_extra_asflags" + @@ -42144,8 +42164,8 @@ CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA " # Executable flags - CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK" - CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK" + CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG" + CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG" @@ -42228,6 +42248,13 @@ if test "x$OPENJDK_TARGET_OS" = xlinux; then LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined" fi + if test "x$TOOLCHAIN_TYPE" = xgcc; then + # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous + # java heap. + if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie" + fi + fi fi @@ -51672,7 +51699,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UCRT DLL dir" >&5 $as_echo_n "checking for UCRT DLL dir... " >&6; } if test "x$with_ucrt_dll_dir" != x; then - if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then + if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "Could not find any dlls in $with_ucrt_dll_dir" "$LINENO" 5