stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8265666: Enable AIX build platform to make external debug symbols

Browse Source 
Reviewed-by: erikj, mdoerr
This commit is contained in:
Andrew Leonard 2021-04-29 12:35:56 +00:00
parent dd8286e2f3
commit 84b52db931
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make/autoconf/jdk-options.m4
View File

@ -240,11 +240,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
[AS_HELP_STRING([--with-native-debug-symbols], [AS_HELP_STRING([--with-native-debug-symbols],
[set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])], [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
[ [
if test "x$OPENJDK_TARGET_OS" = xaix; then if test "x$OPENJDK_TARGET_OS" = xwindows; then
if test "x$withval" = xexternal || test "x$withval" = xzipped; then
AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
fi
elif test "x$OPENJDK_TARGET_OS" = xwindows; then
if test "x$withval" = xinternal; then if test "x$withval" = xinternal; then
AC_MSG_ERROR([Windows does not support the parameter 'internal' for --with-native-debug-symbols]) AC_MSG_ERROR([Windows does not support the parameter 'internal' for --with-native-debug-symbols])
fi fi
@ -254,12 +250,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
if test "x$STATIC_BUILD" = xtrue; then if test "x$STATIC_BUILD" = xtrue; then
with_native_debug_symbols="none" with_native_debug_symbols="none"
else else
if test "x$OPENJDK_TARGET_OS" = xaix; then with_native_debug_symbols="external"
# AIX doesn't support 'external' so use 'internal' as default
with_native_debug_symbols="internal"
else
with_native_debug_symbols="external"
fi
fi fi
]) ])
AC_MSG_RESULT([$with_native_debug_symbols]) AC_MSG_RESULT([$with_native_debug_symbols])

7
make/common/NativeCompilation.gmk
View File

@ -978,6 +978,13 @@ define SetupNativeCompilationBody
$(CD) $$($1_SYMBOLS_DIR) && \ $(CD) $$($1_SYMBOLS_DIR) && \
$$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET) $$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET)
else ifeq ($(call isTargetOs, aix), true)
# AIX does not provide the equivalent of OBJCOPY to extract debug symbols,
# so we copy the compiled object with symbols to the .debuginfo file, which
# happens prior to the STRIP_CMD on the original target object file.
$1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).debuginfo
$1_CREATE_DEBUGINFO_CMDS := $(CP) $$($1_TARGET) $$($1_DEBUGINFO_FILES)
else ifeq ($(call isTargetOs, macosx), true) else ifeq ($(call isTargetOs, macosx), true)
$1_DEBUGINFO_FILES := \ $1_DEBUGINFO_FILES := \
$$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \ $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \