[GR-41537] Workaround for dsymutil bug on Darwin

PullRequest: graal/12850
oracle · Oct 4, 2022 · 0e6baa5 · 0e6baa5
2 parents c2af78b + 6ddd2e6
commit 0e6baa5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...chain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/common/ClangLikeBase.java b/...chain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/common/ClangLikeBase.java
@@ -192,10 +192,15 @@ protected List<String> getArgs() {
         return sulongArgs;
     }
 
-    protected void getCompilerArgs(List<String> sulongArgs) {
+    protected void getDebugCompilerArgs(List<String> sulongArgs) {
         // use -gdwarf-5 instead of -g to enable source file checksums
-        sulongArgs.addAll(Arrays.asList("-flto=full", "-gdwarf-5", "-O1"));
+        sulongArgs.add("-gdwarf-5");
+    }
+
+    protected void getCompilerArgs(List<String> sulongArgs) {
+        sulongArgs.addAll(Arrays.asList("-flto=full", "-O1"));
         sulongArgs.addAll(getVectorInstructionSetFlags());
+        getDebugCompilerArgs(sulongArgs);
     }
 
     private List<String> getVectorInstructionSetFlags() {

diff --git a/...ain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/darwin/DarwinClangLike.java b/...ain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/darwin/DarwinClangLike.java
@@ -52,6 +52,15 @@ public static void runClangCL(String[] args) {
         new DarwinClangLike(args, ClangLikeBase.Tool.ClangCL, OS.getCurrent(), Arch.getCurrent(), NATIVE_PLATFORM).run();
     }
 
+    @Override
+    protected void getDebugCompilerArgs(List<String> sulongArgs) {
+        // [GR-41537] Use -gdwarf-4 instead of -gdwarf-5, as the latter causes a problem in
+        // dsymutil:
+        // > https://github.com/llvm/llvm-project/commit/a17c90daf2e7c3b1817ec29ad6648ce89b927f9a
+        // This workaround can be removed when LLVM is upgraded to >= 15
+        sulongArgs.add("-gdwarf-4");
+    }
+
     @Override
     public void runDriver(List<String> sulongArgs, List<String> userArgs, boolean verb, boolean hlp, boolean earlyexit) {
         DarwinLinker.runDriverWithSaveTemps(this, sulongArgs, userArgs, verb, hlp, earlyexit, "-Wl,", needLinkerFlags, outputFlagPos);