[GR-40042] Don't assume current arch is equal to target arch in LLVM toolchain wrappers.

PullRequest: graal/12331

Author: rschatz

sulong/projects/com.oracle.truffle.llvm.toolchain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/common/ClangLike.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -34,15 +34,15 @@
 public class ClangLike extends ClangLikeBase {
 
     public static void runClangXX(String[] args) {
-        new ClangLike(args, true, OS.getCurrent(), NATIVE_PLATFORM).run();
+        new ClangLike(args, true, OS.getCurrent(), Arch.getCurrent(), NATIVE_PLATFORM).run();
     }
 
     public static void runClang(String[] args) {
-        new ClangLike(args, false, OS.getCurrent(), NATIVE_PLATFORM).run();
+        new ClangLike(args, false, OS.getCurrent(), Arch.getCurrent(), NATIVE_PLATFORM).run();
     }
 
-    protected ClangLike(String[] args, boolean cxx, OS os, String platform) {
-        super(args, cxx, os, platform);
+    protected ClangLike(String[] args, boolean cxx, OS os, Arch arch, String platform) {
+        super(args, cxx, os, arch, platform);
     }
 
     @Override

sulong/projects/com.oracle.truffle.llvm.toolchain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/common/ClangLikeBase.java

@@ -56,15 +56,17 @@ public abstract class ClangLikeBase extends Driver {
     protected final boolean cxx;
     protected final boolean earlyExit;
     protected final OS os;
+    protected final Arch arch;
     protected final String[] args;
     protected final String platform;
     protected final int outputFlagPos;
     protected final boolean nostdincxx;
 
-    protected ClangLikeBase(String[] args, boolean cxx, OS os, String platform) {
+    protected ClangLikeBase(String[] args, boolean cxx, OS os, Arch arch, String platform) {
         super(cxx ? "clang++" : "clang");
         this.cxx = cxx;
         this.os = os;
+        this.arch = arch;
         this.platform = platform;
         boolean mayHaveInputFiles = false;
         boolean mayBeLinkerInvocation = true;
@@ -177,8 +179,8 @@ protected void getCompilerArgs(List<String> sulongArgs) {
         sulongArgs.addAll(getVectorInstructionSetFlags());
     }
 
-    private static List<String> getVectorInstructionSetFlags() {
-        switch (Arch.getCurrent()) {
+    private List<String> getVectorInstructionSetFlags() {
+        switch (arch) {
             case X86_64:
                 return Arrays.asList("-mno-sse3", "-mno-avx");
             case AARCH_64:

sulong/projects/com.oracle.truffle.llvm.toolchain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/common/Driver.java

@@ -116,16 +116,11 @@ public static Arch getCurrent() {
         }
     }
 
-    private static final boolean hasJreDir = System.getProperty("java.specification.version").startsWith("1.");
-
     private static Path getRuntimeDir() {
         Path runtimeDir = HomeFinder.getInstance().getHomeFolder();
         if (runtimeDir == null) {
             throw new IllegalStateException("Could not find GraalVM home");
         }
-        if (hasJreDir) {
-            runtimeDir = runtimeDir.resolve("jre");
-        }
         return runtimeDir;
     }
 

sulong/projects/com.oracle.truffle.llvm.toolchain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/darwin/DarwinClangLike.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -35,16 +35,16 @@
 
 public class DarwinClangLike extends ClangLike {
 
-    protected DarwinClangLike(String[] args, boolean cxx, OS os, String platform) {
-        super(args, cxx, os, platform);
+    protected DarwinClangLike(String[] args, boolean cxx, OS os, Arch arch, String platform) {
+        super(args, cxx, os, arch, platform);
     }
 
     public static void runClangXX(String[] args) {
-        new DarwinClangLike(args, true, OS.getCurrent(), NATIVE_PLATFORM).run();
+        new DarwinClangLike(args, true, OS.getCurrent(), Arch.getCurrent(), NATIVE_PLATFORM).run();
     }
 
     public static void runClang(String[] args) {
-        new DarwinClangLike(args, false, OS.getCurrent(), NATIVE_PLATFORM).run();
+        new DarwinClangLike(args, false, OS.getCurrent(), Arch.getCurrent(), NATIVE_PLATFORM).run();
     }
 
     @Override