jdk8-mips64-public: changeset 2484:648dbf82e75e

     1.1 --- a/.hgtags	Fri Jan 17 19:07:48 2020 +0000
     1.2 +++ b/.hgtags	Mon Jan 27 05:09:57 2020 +0000
     1.3 @@ -988,3 +988,5 @@
     1.4  8ca5f59e3042b7353b64c131be6bb970ba489ce9 jdk8u242-b07
     1.5  5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-b08
     1.6  5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-ga
     1.7 +30768a181ad0f4ba3d37f00bf23d76c875cb043a jdk8u252-b00
     1.8 +5f55e79422a0246076db7d3f2a2c44cb36e0e271 jdk8u252-b01

     2.1 --- a/common/autoconf/flags.m4	Fri Jan 17 19:07:48 2020 +0000
     2.2 +++ b/common/autoconf/flags.m4	Mon Jan 27 05:09:57 2020 +0000
     2.3 @@ -414,6 +414,11 @@
     2.4      AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
     2.5    fi
     2.6  
     2.7 +
     2.8 +  if test "x$ASFLAGS" != "x"; then
     2.9 +    AC_MSG_WARN([Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags])
    2.10 +  fi
    2.11 +
    2.12    AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
    2.13        [extra flags to be used when compiling jdk c-files])])
    2.14  
    2.15 @@ -423,6 +428,9 @@
    2.16    AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
    2.17        [extra flags to be used when linking jdk])])
    2.18  
    2.19 +  AC_ARG_WITH(extra-asflags, [AS_HELP_STRING([--with-extra-asflags],
    2.20 +      [extra flags to be passed to the assembler])])
    2.21 +
    2.22    CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
    2.23    CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
    2.24    LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
    2.25 @@ -431,10 +439,12 @@
    2.26    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
    2.27    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
    2.28    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
    2.29 +  LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
    2.30  
    2.31    AC_SUBST(LEGACY_EXTRA_CFLAGS)
    2.32    AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
    2.33    AC_SUBST(LEGACY_EXTRA_LDFLAGS)
    2.34 +  AC_SUBST(LEGACY_EXTRA_ASFLAGS)
    2.35  
    2.36    ###############################################################################
    2.37    #

     3.1 --- a/common/autoconf/generated-configure.sh	Fri Jan 17 19:07:48 2020 +0000
     3.2 +++ b/common/autoconf/generated-configure.sh	Mon Jan 27 05:09:57 2020 +0000
     3.3 @@ -689,6 +689,7 @@
     3.4  FDLIBM_CFLAGS
     3.5  NO_LIFETIME_DSE_CFLAG
     3.6  NO_DELETE_NULL_POINTER_CHECKS_CFLAG
     3.7 +LEGACY_EXTRA_ASFLAGS
     3.8  LEGACY_EXTRA_LDFLAGS
     3.9  LEGACY_EXTRA_CXXFLAGS
    3.10  LEGACY_EXTRA_CFLAGS
    3.11 @@ -1085,6 +1086,7 @@
    3.12  with_extra_cflags
    3.13  with_extra_cxxflags
    3.14  with_extra_ldflags
    3.15 +with_extra_asflags
    3.16  enable_debug_symbols
    3.17  enable_zip_debug_info
    3.18  with_native_debug_symbols
    3.19 @@ -1947,6 +1949,7 @@
    3.20    --with-extra-cflags     extra flags to be used when compiling jdk c-files
    3.21    --with-extra-cxxflags   extra flags to be used when compiling jdk c++-files
    3.22    --with-extra-ldflags    extra flags to be used when linking jdk
    3.23 +  --with-extra-asflags    extra flags to be passed to the assembler
    3.24    --with-native-debug-symbols
    3.25                            set the native debug symbol configuration (none,
    3.26                            internal, external, zipped) [varying]
    3.27 @@ -4376,7 +4379,7 @@
    3.28  #CUSTOM_AUTOCONF_INCLUDE
    3.29  
    3.30  # Do not change or remove the following line, it is needed for consistency checks:
    3.31 -DATE_WHEN_GENERATED=1565358475
    3.32 +DATE_WHEN_GENERATED=1579517558
    3.33  
    3.34  ###############################################################################
    3.35  #
    3.36 @@ -41499,6 +41502,12 @@
    3.37    fi
    3.38  
    3.39  
    3.40 +  if test "x$ASFLAGS" != "x"; then
    3.41 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&5
    3.42 +$as_echo "$as_me: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&2;}
    3.43 +  fi
    3.44 +
    3.45 +
    3.46  # Check whether --with-extra-cflags was given.
    3.47  if test "${with_extra_cflags+set}" = set; then :
    3.48    withval=$with_extra_cflags;
    3.49 @@ -41519,6 +41528,13 @@
    3.50  fi
    3.51  
    3.52  
    3.53 +
    3.54 +# Check whether --with-extra-asflags was given.
    3.55 +if test "${with_extra_asflags+set}" = set; then :
    3.56 +  withval=$with_extra_asflags;
    3.57 +fi
    3.58 +
    3.59 +
    3.60    CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
    3.61    CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
    3.62    LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
    3.63 @@ -41527,6 +41543,8 @@
    3.64    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
    3.65    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
    3.66    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
    3.67 +  LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
    3.68 +
    3.69  
    3.70  
    3.71  
    3.72 @@ -51600,7 +51618,7 @@
    3.73      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UCRT DLL dir" >&5
    3.74  $as_echo_n "checking for UCRT DLL dir... " >&6; }
    3.75      if test "x$with_ucrt_dll_dir" != x; then
    3.76 -      if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then
    3.77 +      if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then
    3.78          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    3.79  $as_echo "no" >&6; }
    3.80          as_fn_error $? "Could not find any dlls in $with_ucrt_dll_dir" "$LINENO" 5

     4.1 --- a/common/autoconf/hotspot-spec.gmk.in	Fri Jan 17 19:07:48 2020 +0000
     4.2 +++ b/common/autoconf/hotspot-spec.gmk.in	Mon Jan 27 05:09:57 2020 +0000
     4.3 @@ -115,6 +115,7 @@
     4.4  				   $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
     4.5  EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
     4.6  EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
     4.7 +EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@
     4.8  
     4.9  USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@
    4.10

     5.1 --- a/common/autoconf/toolchain_windows.m4	Fri Jan 17 19:07:48 2020 +0000
     5.2 +++ b/common/autoconf/toolchain_windows.m4	Mon Jan 27 05:09:57 2020 +0000
     5.3 @@ -652,7 +652,7 @@
     5.4    if test "x$USE_UCRT" = "xtrue"; then
     5.5      AC_MSG_CHECKING([for UCRT DLL dir])
     5.6      if test "x$with_ucrt_dll_dir" != x; then
     5.7 -      if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then
     5.8 +      if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then
     5.9          AC_MSG_RESULT([no])
    5.10          AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir])
    5.11        else

Mercurial > jdk8-mips64-public / changeset

changeset

Merge