Strip debug sections unconditionally.

Author: jovanstevanovic

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoStripFeature.java

@@ -28,11 +28,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import jdk.graal.compiler.debug.DebugContext;
-import jdk.graal.compiler.debug.DebugContext.Builder;
-import jdk.graal.compiler.debug.Indent;
-import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
-
 import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.svm.core.BuildArtifacts;
@@ -47,12 +42,17 @@
 import com.oracle.svm.hosted.c.util.FileUtils;
 import com.oracle.svm.util.LogUtils;
 
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+
 @AutomaticallyRegisteredFeature
 public class NativeImageDebugInfoStripFeature implements InternalFeature {
 
     @Override
     public boolean isInConfiguration(IsInConfigurationAccess access) {
-        return SubstrateOptions.useDebugInfoGeneration() && SubstrateOptions.StripDebugInfo.getValue();
+        return SubstrateOptions.StripDebugInfo.getValue();
     }
 
     @SuppressWarnings("try")
@@ -82,8 +82,6 @@ private static void stripLinux(AfterImageWriteAccessImpl accessImpl) {
         String debugExtension = ".debug";
         Path imagePath = accessImpl.getImagePath();
         Path imageName = imagePath.getFileName();
-        Path outputDirectory = imagePath.getParent();
-        String debugInfoName = imageName + debugExtension;
         boolean objcopyAvailable = false;
         try {
             objcopyAvailable = FileUtils.executeCommand(objcopyExe, "--version") == 0;
@@ -94,16 +92,21 @@ private static void stripLinux(AfterImageWriteAccessImpl accessImpl) {
         }
 
         if (!objcopyAvailable) {
-            LogUtils.warning("%s not available. Skipping generation of separate debuginfo file %s, debuginfo will remain embedded in the executable.", objcopyExe, debugInfoName);
+            LogUtils.warning("%s not available. The debuginfo will remain embedded in the executable.", objcopyExe);
         } else {
             try {
+                Path outputDirectory = imagePath.getParent();
                 String imageFilePath = outputDirectory.resolve(imageName).toString();
-                Path debugInfoFilePath = outputDirectory.resolve(debugInfoName);
-                FileUtils.executeCommand(objcopyExe, "--only-keep-debug", imageFilePath, debugInfoFilePath.toString());
-                BuildArtifacts.singleton().add(ArtifactType.DEBUG_INFO, debugInfoFilePath);
+                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);
+                }
                 Path exportedSymbolsPath = createKeepSymbolsListFile(accessImpl);
                 FileUtils.executeCommand(objcopyExe, "--strip-all", "--keep-symbols=" + exportedSymbolsPath, imageFilePath);
-                FileUtils.executeCommand(objcopyExe, "--add-gnu-debuglink=" + debugInfoFilePath, imageFilePath);
             } catch (IOException e) {
                 throw UserError.abort("Generation of separate debuginfo file failed", e);
             } catch (InterruptedException e) {