Fix LLVM testsuite (#584)

Author: staticfloat

Artifacts.toml

@@ -1518,24 +1518,24 @@ os = "linux"
 
 [["LLVMBootstrap.v9.0.1.x86_64-linux-musl.squashfs"]]
 arch = "x86_64"
-git-tree-sha1 = "ebfe91185b5c0c78355f3c72dfa81b5f4a071366"
+git-tree-sha1 = "ce8391bf41cd14279a38f5dc187f2a8d228bae1c"
 lazy = true
 libc = "musl"
 os = "linux"
 
     [["LLVMBootstrap.v9.0.1.x86_64-linux-musl.squashfs".download]]
-    sha256 = "93a77e38698c4745c13c7069ed68bf2f2efd082436991dae7031b0e09e85e5cb"
+    sha256 = "ed30ae9a9717316890dbab0ffdaf9808f1e2cc641e07361c11b3e03054977d7c"
     url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/LLVMBootstrap-v9.0.1+0/LLVMBootstrap.v9.0.1.x86_64-linux-musl.squashfs.tar.gz"
 
 [["LLVMBootstrap.v9.0.1.x86_64-linux-musl.unpacked"]]
 arch = "x86_64"
-git-tree-sha1 = "d6143763e96215a9e4b4e3da94e2273dd61efdc3"
+git-tree-sha1 = "1141df3ecf6d0e3291fc788173a1aaa6ebad8167"
 lazy = true
 libc = "musl"
 os = "linux"
 
     [["LLVMBootstrap.v9.0.1.x86_64-linux-musl.unpacked".download]]
-    sha256 = "1fe08128e8aede8ff3f04aa07c516f49076a0dd3f08b624dabbe90fea7493f7d"
+    sha256 = "a082493b987f56abd6cba5050487414fa5b374f7a5a5e9e36b09094ecd304b96"
     url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/LLVMBootstrap-v9.0.1+0/LLVMBootstrap.v9.0.1.x86_64-linux-musl.unpacked.tar.gz"
 
 [["PlatformSupport-aarch64-linux-gnu.v2019.12.20.x86_64-linux-musl.squashfs"]]

src/Runner.jl

@@ -155,7 +155,7 @@ function generate_compiler_wrappers!(platform::Platform; bin_path::AbstractStrin
         # On macOS, if we're on an old GCC, the default -syslibroot that gets
         # passed to the linker isn't calculated correctly, so we have to manually set it.
         if select_gcc_version(p).major == 4
-            FLAGS *= " -Wl,-syslibroot,/opt/$(target)/$(target)/sys-root"
+            FLAGS *= " -Wl,-syslibroot,/opt/$(triplet(p))/$(triplet(p))/sys-root"
         end
         return FLAGS
     end
@@ -169,7 +169,7 @@ function generate_compiler_wrappers!(platform::Platform; bin_path::AbstractStrin
         # On macOS, if we're on an old GCC, the default -syslibroot that gets
         # passed to the linker isn't calculated correctly, so we have to manually set it.
         if select_gcc_version(p).major == 4
-            FLAGS *= " -Wl,-syslibroot,/opt/$(target)/$(target)/sys-root"
+            FLAGS *= " -Wl,-syslibroot,/opt/$(triplet(p))/$(triplet(p))/sys-root"
         end
         return FLAGS
     end
@@ -187,25 +187,27 @@ function generate_compiler_wrappers!(platform::Platform; bin_path::AbstractStrin
         # Next, on MacOS, we need to override the typical C++ include search paths, because it always includes
         # the toolchain C++ headers first.  Valentin tracked this down to:
         # https://github.com/llvm/llvm-project/blob/0378f3a90341d990236c44f297b923a32b35fab1/clang/lib/Driver/ToolChains/Darwin.cpp#L1944-L1978
-        FLAGS *= " -nostdinc++ -isystem /opt/$(target)/$(target)/sys-root/usr/include/c++/v1"
+        FLAGS *= " -nostdinc++ -isystem /opt/$(triplet(p))/$(triplet(p))/sys-root/usr/include/c++/v1"
         return FLAGS
     end
 
+    # On FreeBSD, our clang flags are simple
     clang_flags(p::FreeBSD) = clang_targeting_laser(p)
-    # For everything else, there's MasterCard (TM) (.... also, we need to provide `-rtlib=libgcc` because clang-builtins are broken)
-    clang_flags(p::Platform) = "$(clang_targeting_laser(p)) --gcc-toolchain=/opt/$(triplet(p)) -rtlib=libgcc"
+
+    # For everything else, there's MasterCard (TM) (.... also, we need to provide `-rtlib=libgcc` because clang-builtins are broken,
+    # and we also need to provide `-stdlib=libstdc++` to match Julia on these platforms.)
+    clang_flags(p::Platform) = "$(clang_targeting_laser(p)) --gcc-toolchain=/opt/$(triplet(p)) -rtlib=libgcc -stdlib=libstdc++"
 
 
     # On macos, we want to use a particular linker with clang.  But we want to avoid warnings about unused
     # flags when just compiling, so we put it into "linker-only flags".
-    clang_link_flags(p::Platform) = String[]
-    clang_link_flags(p::FreeBSD) = ["-L/opt/$(target)/$(target)/lib"]
-    clang_link_flags(p::MacOS) = ["-L/opt/$(target)/$(target)/lib", "-fuse-ld=macos"]
+    clang_link_flags(p::Platform) = String["-fuse-ld=$(triplet(p))"]
+    clang_link_flags(p::Union{FreeBSD,MacOS}) = ["-L/opt/$(triplet(p))/$(triplet(p))/lib", "-fuse-ld=$(triplet(p))"]
 
     gcc_link_flags(p::Platform) = String[]
     function gcc_link_flags(p::Linux)
         if arch(p) == :powerpc64le && select_gcc_version(p).major == 4
-            return ["-L/opt/$(target)/$(target)/sys-root/lib64", "-Wl,-rpath-link,/opt/$(target)/$(target)/sys-root/lib64"]
+            return ["-L/opt/$(triplet(p))/$(triplet(p))/sys-root/lib64", "-Wl,-rpath-link,/opt/$(triplet(p))/$(triplet(p))/sys-root/lib64"]
         end
         return String[]
     end
@@ -320,6 +322,12 @@ function generate_compiler_wrappers!(platform::Platform; bin_path::AbstractStrin
         write_wrapper(cpp, p, "$(t)-cpp")
         write_wrapper(cxxfilt, p, "$(t)-c++filt")
         write_wrapper(ld, p, "$(t)-ld")
+        # ld wrappers for clang's `-fuse-ld=$(target)`
+        if isa(p, MacOS)
+            write_wrapper(ld, p, "ld64.$(t)")
+        else
+            write_wrapper(ld, p, "ld.$(t)")
+        end
         write_wrapper(nm, p, "$(t)-nm")
         write_wrapper(libtool, p, "$(t)-libtool")
         write_wrapper(objcopy, p, "$(t)-objcopy")