1.1 --- a/common/autoconf/generated-configure.sh Wed Apr 15 11:14:57 2020 +0800
1.2 +++ b/common/autoconf/generated-configure.sh Wed Apr 15 11:49:54 2020 +0800
1.3 @@ -689,6 +689,7 @@
1.4 FDLIBM_CFLAGS
1.5 NO_LIFETIME_DSE_CFLAG
1.6 NO_DELETE_NULL_POINTER_CHECKS_CFLAG
1.7 +LEGACY_EXTRA_ASFLAGS
1.8 LEGACY_EXTRA_LDFLAGS
1.9 LEGACY_EXTRA_CXXFLAGS
1.10 LEGACY_EXTRA_CFLAGS
1.11 @@ -1088,6 +1089,7 @@
1.12 with_extra_cflags
1.13 with_extra_cxxflags
1.14 with_extra_ldflags
1.15 +with_extra_asflags
1.16 enable_debug_symbols
1.17 enable_zip_debug_info
1.18 with_native_debug_symbols
1.19 @@ -1950,6 +1952,7 @@
1.20 --with-extra-cflags extra flags to be used when compiling jdk c-files
1.21 --with-extra-cxxflags extra flags to be used when compiling jdk c++-files
1.22 --with-extra-ldflags extra flags to be used when linking jdk
1.23 + --with-extra-asflags extra flags to be passed to the assembler
1.24 --with-native-debug-symbols
1.25 set the native debug symbol configuration (none,
1.26 internal, external, zipped) [varying]
1.27 @@ -4385,7 +4388,7 @@
1.28 #CUSTOM_AUTOCONF_INCLUDE
1.29
1.30 # Do not change or remove the following line, it is needed for consistency checks:
1.31 -DATE_WHEN_GENERATED=1565358475
1.32 +DATE_WHEN_GENERATED=1585090987
1.33
1.34 ###############################################################################
1.35 #
1.36 @@ -19797,8 +19800,6 @@
1.37
1.38 if test "x$with_cacerts_file" != x; then
1.39 CACERTS_FILE=$with_cacerts_file
1.40 - else
1.41 - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
1.42 fi
1.43
1.44
1.45 @@ -41307,6 +41308,7 @@
1.46
1.47 if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.48 PICFLAG="-fPIC"
1.49 + PIEFLAG="-fPIE"
1.50 C_FLAG_REORDER=''
1.51 CXX_FLAG_REORDER=''
1.52
1.53 @@ -41327,6 +41329,7 @@
1.54 fi
1.55 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.56 PICFLAG="-KPIC"
1.57 + PIEFLAG=""
1.58 C_FLAG_REORDER='-xF'
1.59 CXX_FLAG_REORDER='-xF'
1.60 SHARED_LIBRARY_FLAGS="-G"
1.61 @@ -41336,6 +41339,7 @@
1.62 SET_SHARED_LIBRARY_MAPFILE='-M$1'
1.63 elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.64 PICFLAG="-qpic=large"
1.65 + PIEFLAG=""
1.66 C_FLAG_REORDER=''
1.67 CXX_FLAG_REORDER=''
1.68 SHARED_LIBRARY_FLAGS="-qmkshrobj"
1.69 @@ -41345,6 +41349,7 @@
1.70 SET_SHARED_LIBRARY_MAPFILE=''
1.71 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.72 PICFLAG=""
1.73 + PIEFLAG=""
1.74 C_FLAG_REORDER=''
1.75 CXX_FLAG_REORDER=''
1.76 SHARED_LIBRARY_FLAGS="-LD"
1.77 @@ -41571,6 +41576,12 @@
1.78 fi
1.79
1.80
1.81 + if test "x$ASFLAGS" != "x"; then
1.82 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&5
1.83 +$as_echo "$as_me: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&2;}
1.84 + fi
1.85 +
1.86 +
1.87 # Check whether --with-extra-cflags was given.
1.88 if test "${with_extra_cflags+set}" = set; then :
1.89 withval=$with_extra_cflags;
1.90 @@ -41591,6 +41602,13 @@
1.91 fi
1.92
1.93
1.94 +
1.95 +# Check whether --with-extra-asflags was given.
1.96 +if test "${with_extra_asflags+set}" = set; then :
1.97 + withval=$with_extra_asflags;
1.98 +fi
1.99 +
1.100 +
1.101 CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
1.102 CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
1.103 LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
1.104 @@ -41599,6 +41617,8 @@
1.105 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
1.106 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
1.107 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
1.108 + LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
1.109 +
1.110
1.111
1.112
1.113 @@ -42144,8 +42164,8 @@
1.114 CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
1.115
1.116 # Executable flags
1.117 - CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
1.118 - CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
1.119 + CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
1.120 + CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
1.121
1.122
1.123
1.124 @@ -42228,6 +42248,13 @@
1.125 if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.126 LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
1.127 fi
1.128 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.129 + # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
1.130 + # java heap.
1.131 + if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
1.132 + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
1.133 + fi
1.134 + fi
1.135 fi
1.136
1.137
1.138 @@ -51672,7 +51699,7 @@
1.139 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UCRT DLL dir" >&5
1.140 $as_echo_n "checking for UCRT DLL dir... " >&6; }
1.141 if test "x$with_ucrt_dll_dir" != x; then
1.142 - if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then
1.143 + if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then
1.144 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.145 $as_echo "no" >&6; }
1.146 as_fn_error $? "Could not find any dlls in $with_ucrt_dll_dir" "$LINENO" 5
