Mercurial > hg > openjdk > jdk8u
changeset 2429:5f55e79422a0 jdk8u252-b01
8227397: Add --with-extra-asflags configure option
Reviewed-by: andrew, ihse, martin
author | sgehwolf |
---|---|
date | Fri, 27 Sep 2019 16:20:32 +0200 |
parents | 72fbf717acb0 |
children | 1cb844dfc740 56f82ab96821 |
files | common/autoconf/flags.m4 common/autoconf/generated-configure.sh common/autoconf/hotspot-spec.gmk.in |
diffstat | 3 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Mon Jan 20 11:31:14 2020 +0100 +++ b/common/autoconf/flags.m4 Fri Sep 27 16:20:32 2019 +0200 @@ -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 Mon Jan 20 11:31:14 2020 +0100 +++ b/common/autoconf/generated-configure.sh Fri Sep 27 16:20:32 2019 +0200 @@ -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=1579512479 +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" +
--- a/common/autoconf/hotspot-spec.gmk.in Mon Jan 20 11:31:14 2020 +0100 +++ b/common/autoconf/hotspot-spec.gmk.in Fri Sep 27 16:20:32 2019 +0200 @@ -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@