提交 64a8a9c0 编写于 作者: S sgehwolf

8227397: Add --with-extra-asflags configure option

Reviewed-by: andrew, ihse, martin

--HG--
extra : rebase_source : 2a25c760fc8d468cccafe00de91fe0d3b9d86c8b
extra : amend_source : 83bcf47ccd45089930e82168efd66c8b03c63fbc
上级 975088d7
...@@ -414,6 +414,11 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], ...@@ -414,6 +414,11 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags]) AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
fi 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], AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
[extra flags to be used when compiling jdk c-files])]) [extra flags to be used when compiling jdk c-files])])
...@@ -423,6 +428,9 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], ...@@ -423,6 +428,9 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags], AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
[extra flags to be used when linking jdk])]) [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" CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
...@@ -431,10 +439,12 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], ...@@ -431,10 +439,12 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags" LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags" LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
AC_SUBST(LEGACY_EXTRA_CFLAGS) AC_SUBST(LEGACY_EXTRA_CFLAGS)
AC_SUBST(LEGACY_EXTRA_CXXFLAGS) AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
AC_SUBST(LEGACY_EXTRA_LDFLAGS) AC_SUBST(LEGACY_EXTRA_LDFLAGS)
AC_SUBST(LEGACY_EXTRA_ASFLAGS)
############################################################################### ###############################################################################
# #
......
...@@ -689,6 +689,7 @@ MACOSX_VERSION_MIN ...@@ -689,6 +689,7 @@ MACOSX_VERSION_MIN
FDLIBM_CFLAGS FDLIBM_CFLAGS
NO_LIFETIME_DSE_CFLAG NO_LIFETIME_DSE_CFLAG
NO_DELETE_NULL_POINTER_CHECKS_CFLAG NO_DELETE_NULL_POINTER_CHECKS_CFLAG
LEGACY_EXTRA_ASFLAGS
LEGACY_EXTRA_LDFLAGS LEGACY_EXTRA_LDFLAGS
LEGACY_EXTRA_CXXFLAGS LEGACY_EXTRA_CXXFLAGS
LEGACY_EXTRA_CFLAGS LEGACY_EXTRA_CFLAGS
...@@ -1085,6 +1086,7 @@ with_jtreg ...@@ -1085,6 +1086,7 @@ with_jtreg
with_extra_cflags with_extra_cflags
with_extra_cxxflags with_extra_cxxflags
with_extra_ldflags with_extra_ldflags
with_extra_asflags
enable_debug_symbols enable_debug_symbols
enable_zip_debug_info enable_zip_debug_info
with_native_debug_symbols with_native_debug_symbols
...@@ -1947,6 +1949,7 @@ Optional Packages: ...@@ -1947,6 +1949,7 @@ Optional Packages:
--with-extra-cflags extra flags to be used when compiling jdk c-files --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-cxxflags extra flags to be used when compiling jdk c++-files
--with-extra-ldflags extra flags to be used when linking jdk --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 --with-native-debug-symbols
set the native debug symbol configuration (none, set the native debug symbol configuration (none,
internal, external, zipped) [varying] internal, external, zipped) [varying]
...@@ -4376,7 +4379,7 @@ VS_SDK_PLATFORM_NAME_2017= ...@@ -4376,7 +4379,7 @@ VS_SDK_PLATFORM_NAME_2017=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # 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 @@ $as_echo "$as_me: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use ...@@ -41499,6 +41502,12 @@ $as_echo "$as_me: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use
fi 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. # Check whether --with-extra-cflags was given.
if test "${with_extra_cflags+set}" = set; then : if test "${with_extra_cflags+set}" = set; then :
withval=$with_extra_cflags; withval=$with_extra_cflags;
...@@ -41519,6 +41528,13 @@ if test "${with_extra_ldflags+set}" = set; then : ...@@ -41519,6 +41528,13 @@ if test "${with_extra_ldflags+set}" = set; then :
fi 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" CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
...@@ -41527,6 +41543,8 @@ fi ...@@ -41527,6 +41543,8 @@ fi
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags" LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags" LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
...@@ -115,6 +115,7 @@ EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \ ...@@ -115,6 +115,7 @@ EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
$(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@ EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@ EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@
USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@ USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册