mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 03:58:21 +00:00
8374767: Amend JDK-8374521 with new option name
Reviewed-by: clanger, krk
This commit is contained in:
parent
92abc6dfe4
commit
1fb5030ab3
2
.github/workflows/build-alpine-linux.yml
vendored
2
.github/workflows/build-alpine-linux.yml
vendored
@ -97,7 +97,7 @@ jobs:
|
|||||||
--with-zlib=system
|
--with-zlib=system
|
||||||
--with-jmod-compress=zip-1
|
--with-jmod-compress=zip-1
|
||||||
--with-external-symbols-in-bundles=none
|
--with-external-symbols-in-bundles=none
|
||||||
--with-debug-info-level=1
|
--with-native-debug-symbols-level=1
|
||||||
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
|
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
|
||||||
echo "Dumping config.log:" &&
|
echo "Dumping config.log:" &&
|
||||||
cat config.log &&
|
cat config.log &&
|
||||||
|
|||||||
2
.github/workflows/build-cross-compile.yml
vendored
2
.github/workflows/build-cross-compile.yml
vendored
@ -180,7 +180,7 @@ jobs:
|
|||||||
--with-sysroot=sysroot
|
--with-sysroot=sysroot
|
||||||
--with-jmod-compress=zip-1
|
--with-jmod-compress=zip-1
|
||||||
--with-external-symbols-in-bundles=none
|
--with-external-symbols-in-bundles=none
|
||||||
--with-debug-info-level=1
|
--with-native-debug-symbols-level=1
|
||||||
CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
|
CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
|
||||||
CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
|
CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
|
||||||
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
|
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
|
||||||
|
|||||||
2
.github/workflows/build-linux.yml
vendored
2
.github/workflows/build-linux.yml
vendored
@ -144,7 +144,7 @@ jobs:
|
|||||||
--with-zlib=system
|
--with-zlib=system
|
||||||
--with-jmod-compress=zip-1
|
--with-jmod-compress=zip-1
|
||||||
--with-external-symbols-in-bundles=none
|
--with-external-symbols-in-bundles=none
|
||||||
--with-debug-info-level=1
|
--with-native-debug-symbols-level=1
|
||||||
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
|
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
|
||||||
echo "Dumping config.log:" &&
|
echo "Dumping config.log:" &&
|
||||||
cat config.log &&
|
cat config.log &&
|
||||||
|
|||||||
2
.github/workflows/build-macos.yml
vendored
2
.github/workflows/build-macos.yml
vendored
@ -111,7 +111,7 @@ jobs:
|
|||||||
--with-zlib=system
|
--with-zlib=system
|
||||||
--with-jmod-compress=zip-1
|
--with-jmod-compress=zip-1
|
||||||
--with-external-symbols-in-bundles=none
|
--with-external-symbols-in-bundles=none
|
||||||
--with-debug-info-level=1
|
--with-native-debug-symbols-level=1
|
||||||
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
|
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
|
||||||
echo "Dumping config.log:" &&
|
echo "Dumping config.log:" &&
|
||||||
cat config.log &&
|
cat config.log &&
|
||||||
|
|||||||
@ -69,20 +69,20 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
|
|||||||
# Debug prefix mapping if supported by compiler
|
# Debug prefix mapping if supported by compiler
|
||||||
DEBUG_PREFIX_CFLAGS=
|
DEBUG_PREFIX_CFLAGS=
|
||||||
|
|
||||||
UTIL_ARG_WITH(NAME: debug-info-level, TYPE: string,
|
UTIL_ARG_WITH(NAME: native-debug-symbols-level, TYPE: string,
|
||||||
DEFAULT: "",
|
DEFAULT: "",
|
||||||
RESULT: DEBUG_INFO_LEVEL,
|
RESULT: DEBUG_SYMBOLS_LEVEL,
|
||||||
DESC: [Sets the debug info level, when debug info generation is enabled (GCC and Clang only)],
|
DESC: [set the native debug symbol level (GCC and Clang only)],
|
||||||
DEFAULT_DESC: [default])
|
DEFAULT_DESC: [toolchain default])
|
||||||
AC_SUBST(DEBUG_INFO_LEVEL)
|
AC_SUBST(DEBUG_SYMBOLS_LEVEL)
|
||||||
|
|
||||||
if test "x${TOOLCHAIN_TYPE}" = xgcc || \
|
if test "x${TOOLCHAIN_TYPE}" = xgcc || \
|
||||||
test "x${TOOLCHAIN_TYPE}" = xclang; then
|
test "x${TOOLCHAIN_TYPE}" = xclang; then
|
||||||
DEBUG_INFO_LEVEL_FLAGS="-g"
|
DEBUG_SYMBOLS_LEVEL_FLAGS="-g"
|
||||||
if test "x${DEBUG_INFO_LEVEL}" != "x"; then
|
if test "x${DEBUG_SYMBOLS_LEVEL}" != "x"; then
|
||||||
DEBUG_INFO_LEVEL_FLAGS="-g${DEBUG_INFO_LEVEL}"
|
DEBUG_SYMBOLS_LEVEL_FLAGS="-g${DEBUG_SYMBOLS_LEVEL}"
|
||||||
FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_INFO_LEVEL_FLAGS}],
|
FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_SYMBOLS_LEVEL_FLAGS}],
|
||||||
IF_FALSE: AC_MSG_ERROR("Debug info level ${DEBUG_INFO_LEVEL} is not supported"))
|
IF_FALSE: AC_MSG_ERROR("Debug info level ${DEBUG_SYMBOLS_LEVEL} is not supported"))
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -111,8 +111,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Debug info level should follow the debug format to be effective.
|
# Debug info level should follow the debug format to be effective.
|
||||||
CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 ${DEBUG_INFO_LEVEL_FLAGS}"
|
CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 ${DEBUG_SYMBOLS_LEVEL_FLAGS}"
|
||||||
ASFLAGS_DEBUG_SYMBOLS="${DEBUG_INFO_LEVEL_FLAGS}"
|
ASFLAGS_DEBUG_SYMBOLS="${DEBUG_SYMBOLS_LEVEL_FLAGS}"
|
||||||
elif test "x$TOOLCHAIN_TYPE" = xclang; then
|
elif test "x$TOOLCHAIN_TYPE" = xclang; then
|
||||||
if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
|
if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
|
||||||
# Check if compiler supports -fdebug-prefix-map. If so, use that to make
|
# Check if compiler supports -fdebug-prefix-map. If so, use that to make
|
||||||
@ -132,8 +132,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
|
|||||||
IF_FALSE: [GDWARF_FLAGS=""])
|
IF_FALSE: [GDWARF_FLAGS=""])
|
||||||
|
|
||||||
# Debug info level should follow the debug format to be effective.
|
# Debug info level should follow the debug format to be effective.
|
||||||
CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} ${DEBUG_INFO_LEVEL_FLAGS}"
|
CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} ${DEBUG_SYMBOLS_LEVEL_FLAGS}"
|
||||||
ASFLAGS_DEBUG_SYMBOLS="${DEBUG_INFO_LEVEL_FLAGS}"
|
ASFLAGS_DEBUG_SYMBOLS="${DEBUG_SYMBOLS_LEVEL_FLAGS}"
|
||||||
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
|
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
|
||||||
CFLAGS_DEBUG_SYMBOLS="-Z7"
|
CFLAGS_DEBUG_SYMBOLS="-Z7"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user