Fri, 27 Sep 2019 16:20:32 +0200
8227397: Add --with-extra-asflags configure option
Reviewed-by: andrew, ihse, martin
1.1 --- a/common/autoconf/flags.m4 Mon Jan 20 11:31:14 2020 +0100 1.2 +++ b/common/autoconf/flags.m4 Fri Sep 27 16:20:32 2019 +0200 1.3 @@ -414,6 +414,11 @@ 1.4 AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags]) 1.5 fi 1.6 1.7 + 1.8 + if test "x$ASFLAGS" != "x"; then 1.9 + AC_MSG_WARN([Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags]) 1.10 + fi 1.11 + 1.12 AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags], 1.13 [extra flags to be used when compiling jdk c-files])]) 1.14 1.15 @@ -423,6 +428,9 @@ 1.16 AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags], 1.17 [extra flags to be used when linking jdk])]) 1.18 1.19 + AC_ARG_WITH(extra-asflags, [AS_HELP_STRING([--with-extra-asflags], 1.20 + [extra flags to be passed to the assembler])]) 1.21 + 1.22 CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags" 1.23 CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" 1.24 LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" 1.25 @@ -431,10 +439,12 @@ 1.26 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags" 1.27 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags" 1.28 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags" 1.29 + LEGACY_EXTRA_ASFLAGS="$with_extra_asflags" 1.30 1.31 AC_SUBST(LEGACY_EXTRA_CFLAGS) 1.32 AC_SUBST(LEGACY_EXTRA_CXXFLAGS) 1.33 AC_SUBST(LEGACY_EXTRA_LDFLAGS) 1.34 + AC_SUBST(LEGACY_EXTRA_ASFLAGS) 1.35 1.36 ############################################################################### 1.37 #
2.1 --- a/common/autoconf/generated-configure.sh Mon Jan 20 11:31:14 2020 +0100 2.2 +++ b/common/autoconf/generated-configure.sh Fri Sep 27 16:20:32 2019 +0200 2.3 @@ -689,6 +689,7 @@ 2.4 FDLIBM_CFLAGS 2.5 NO_LIFETIME_DSE_CFLAG 2.6 NO_DELETE_NULL_POINTER_CHECKS_CFLAG 2.7 +LEGACY_EXTRA_ASFLAGS 2.8 LEGACY_EXTRA_LDFLAGS 2.9 LEGACY_EXTRA_CXXFLAGS 2.10 LEGACY_EXTRA_CFLAGS 2.11 @@ -1085,6 +1086,7 @@ 2.12 with_extra_cflags 2.13 with_extra_cxxflags 2.14 with_extra_ldflags 2.15 +with_extra_asflags 2.16 enable_debug_symbols 2.17 enable_zip_debug_info 2.18 with_native_debug_symbols 2.19 @@ -1947,6 +1949,7 @@ 2.20 --with-extra-cflags extra flags to be used when compiling jdk c-files 2.21 --with-extra-cxxflags extra flags to be used when compiling jdk c++-files 2.22 --with-extra-ldflags extra flags to be used when linking jdk 2.23 + --with-extra-asflags extra flags to be passed to the assembler 2.24 --with-native-debug-symbols 2.25 set the native debug symbol configuration (none, 2.26 internal, external, zipped) [varying] 2.27 @@ -4376,7 +4379,7 @@ 2.28 #CUSTOM_AUTOCONF_INCLUDE 2.29 2.30 # Do not change or remove the following line, it is needed for consistency checks: 2.31 -DATE_WHEN_GENERATED=1579512479 2.32 +DATE_WHEN_GENERATED=1579517558 2.33 2.34 ############################################################################### 2.35 # 2.36 @@ -41499,6 +41502,12 @@ 2.37 fi 2.38 2.39 2.40 + if test "x$ASFLAGS" != "x"; then 2.41 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&5 2.42 +$as_echo "$as_me: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&2;} 2.43 + fi 2.44 + 2.45 + 2.46 # Check whether --with-extra-cflags was given. 2.47 if test "${with_extra_cflags+set}" = set; then : 2.48 withval=$with_extra_cflags; 2.49 @@ -41519,6 +41528,13 @@ 2.50 fi 2.51 2.52 2.53 + 2.54 +# Check whether --with-extra-asflags was given. 2.55 +if test "${with_extra_asflags+set}" = set; then : 2.56 + withval=$with_extra_asflags; 2.57 +fi 2.58 + 2.59 + 2.60 CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags" 2.61 CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" 2.62 LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" 2.63 @@ -41527,6 +41543,8 @@ 2.64 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags" 2.65 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags" 2.66 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags" 2.67 + LEGACY_EXTRA_ASFLAGS="$with_extra_asflags" 2.68 + 2.69 2.70 2.71
3.1 --- a/common/autoconf/hotspot-spec.gmk.in Mon Jan 20 11:31:14 2020 +0100 3.2 +++ b/common/autoconf/hotspot-spec.gmk.in Fri Sep 27 16:20:32 2019 +0200 3.3 @@ -115,6 +115,7 @@ 3.4 $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) 3.5 EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@ 3.6 EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@ 3.7 +EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@ 3.8 3.9 USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@ 3.10