Skip to content

[GR-68017] Fix loader issue that occurs with -H:-StripDebugInfo. #11912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2025
Merged

[GR-68017] Fix loader issue that occurs with -H:-StripDebugInfo. #11912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 34 additions & 14 deletions ...m.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoStripFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ public class NativeImageDebugInfoStripFeature implements InternalFeature {

@Override
public boolean isInConfiguration(IsInConfigurationAccess access) {
return SubstrateOptions.StripDebugInfo.getValue();
/*
* Make sure this feature always runs for ELF object files to fix the object file's
* alignment with objcopy. This is a temporary workaround; a proper fix will be provided
* with GR-68594.
*/
return SubstrateOptions.StripDebugInfo.getValue() || ObjectFile.getNativeFormat() == ObjectFile.Format.ELF;
}

@SuppressWarnings("try")
Expand Down Expand Up @@ -112,20 +117,35 @@ private static boolean stripLinux(AfterImageWriteAccessImpl accessImpl) {
try {
Path outputDirectory = imagePath.getParent();
String imageFilePath = outputDirectory.resolve(imageName).toString();
if (SubstrateOptions.useDebugInfoGeneration()) {
/* Generate a separate debug file before stripping the executable. */
String debugInfoName = imageName + debugExtension;
Path debugInfoFilePath = outputDirectory.resolve(debugInfoName);
FileUtils.executeCommand(objcopyExe, "--only-keep-debug", imageFilePath, debugInfoFilePath.toString());
BuildArtifacts.singleton().add(ArtifactType.DEBUG_INFO, debugInfoFilePath);
FileUtils.executeCommand(objcopyExe, "--add-gnu-debuglink=" + debugInfoFilePath, imageFilePath);
}
if (SubstrateOptions.DeleteLocalSymbols.getValue()) {
/* Strip debug info and local symbols. */
FileUtils.executeCommand(objcopyExe, "--strip-all", imageFilePath);
if (SubstrateOptions.StripDebugInfo.getValue()) {
if (SubstrateOptions.useDebugInfoGeneration()) {
/* Generate a separate debug file before stripping the executable. */
String debugInfoName = imageName + debugExtension;
Path debugInfoFilePath = outputDirectory.resolve(debugInfoName);
FileUtils.executeCommand(objcopyExe, "--only-keep-debug", imageFilePath, debugInfoFilePath.toString());
BuildArtifacts.singleton().add(ArtifactType.DEBUG_INFO, debugInfoFilePath);
FileUtils.executeCommand(objcopyExe, "--add-gnu-debuglink=" + debugInfoFilePath, imageFilePath);
}
if (SubstrateOptions.DeleteLocalSymbols.getValue()) {
/* Strip debug info and local symbols. */
FileUtils.executeCommand(objcopyExe, "--strip-all", imageFilePath);
} else {
/* Strip debug info only. */
FileUtils.executeCommand(objcopyExe, "--strip-debug", imageFilePath);
}
} else {
/* Strip debug info only. */
FileUtils.executeCommand(objcopyExe, "--strip-debug", imageFilePath);
/*
* Make sure the object file is properly aligned. This step creates a temporary
* file and then destructively renames it to the original image file name. In
* effect, the original native image object file is copied and replaced with the
* output of objcopy.
*
* This is a temporary workaround; a proper fix will be provided with GR-68594.
*/
FileUtils.executeCommand(objcopyExe, imageFilePath);

/* Nothing was actually stripped here. */
return false;
}
return true;
} catch (IOException e) {
Expand Down
Loading