Mercurial > hg > openjdk > jdk8u
changeset 2431:648dbf82e75e
Merge
author | andrew |
---|---|
date | Mon, 27 Jan 2020 05:09:57 +0000 |
parents | 3818ce58ca67 (current diff) 1cb844dfc740 (diff) |
children | 9fb3e77d22d6 |
files | .hgtags |
diffstat | 5 files changed, 34 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jan 17 19:07:48 2020 +0000 +++ b/.hgtags Mon Jan 27 05:09:57 2020 +0000 @@ -988,3 +988,5 @@ 8ca5f59e3042b7353b64c131be6bb970ba489ce9 jdk8u242-b07 5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-b08 5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-ga +30768a181ad0f4ba3d37f00bf23d76c875cb043a jdk8u252-b00 +5f55e79422a0246076db7d3f2a2c44cb36e0e271 jdk8u252-b01
--- a/common/autoconf/flags.m4 Fri Jan 17 19:07:48 2020 +0000 +++ b/common/autoconf/flags.m4 Mon Jan 27 05:09:57 2020 +0000 @@ -414,6 +414,11 @@ AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags]) fi + + if test "x$ASFLAGS" != "x"; then + AC_MSG_WARN([Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags]) + fi + AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags], [extra flags to be used when compiling jdk c-files])]) @@ -423,6 +428,9 @@ AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags], [extra flags to be used when linking jdk])]) + AC_ARG_WITH(extra-asflags, [AS_HELP_STRING([--with-extra-asflags], + [extra flags to be passed to the assembler])]) + CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags" CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" @@ -431,10 +439,12 @@ 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" AC_SUBST(LEGACY_EXTRA_CFLAGS) AC_SUBST(LEGACY_EXTRA_CXXFLAGS) AC_SUBST(LEGACY_EXTRA_LDFLAGS) + AC_SUBST(LEGACY_EXTRA_ASFLAGS) ############################################################################### #
--- a/common/autoconf/generated-configure.sh Fri Jan 17 19:07:48 2020 +0000 +++ b/common/autoconf/generated-configure.sh Mon Jan 27 05:09:57 2020 +0000 @@ -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 @@ -1085,6 +1086,7 @@ with_extra_cflags with_extra_cxxflags with_extra_ldflags +with_extra_asflags enable_debug_symbols enable_zip_debug_info with_native_debug_symbols @@ -1947,6 +1949,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] @@ -4376,7 +4379,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=1579517558 ############################################################################### # @@ -41499,6 +41502,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; @@ -41519,6 +41528,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" @@ -41527,6 +41543,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" + @@ -51600,7 +51618,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
--- a/common/autoconf/hotspot-spec.gmk.in Fri Jan 17 19:07:48 2020 +0000 +++ b/common/autoconf/hotspot-spec.gmk.in Mon Jan 27 05:09:57 2020 +0000 @@ -115,6 +115,7 @@ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@ EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@ +EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@ USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@
--- a/common/autoconf/toolchain_windows.m4 Fri Jan 17 19:07:48 2020 +0000 +++ b/common/autoconf/toolchain_windows.m4 Mon Jan 27 05:09:57 2020 +0000 @@ -652,7 +652,7 @@ if test "x$USE_UCRT" = "xtrue"; then AC_MSG_CHECKING([for UCRT DLL dir]) 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 AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir]) else