@@ -0,0 +1,53 @@
1+Index: lib/Driver/ToolChains/BareMetal.cpp
2+===================================================================
3+--- a/lib/Driver/ToolChains/BareMetal.cpp
4++++ b/lib/Driver/ToolChains/BareMetal.cpp
5+@@ -157,7 +157,7 @@
6+ void BareMetal::AddLinkRuntimeLib(const ArgList &Args,
7+ ArgStringList &CmdArgs) const {
8+ CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +
9+- getTriple().getArchName() + ".a"));
10++ getTriple().getArchName()));
11+ }
12+
13+ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
14+Index: test/Driver/baremetal.cpp
15+===================================================================
16+--- a/test/Driver/baremetal.cpp
17++++ b/test/Driver/baremetal.cpp
18+@@ -13,7 +13,7 @@
19+ // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
20+ // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"
21+ // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"
22+-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
23++// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
24+ // CHECK-V6M-C-SAME: "-o" "{{.*}}.o"
25+
26+ // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
27+@@ -35,7 +35,7 @@
28+ // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
29+ // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
30+ // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
31+-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
32++// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
33+ // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"
34+
35+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
36+@@ -48,7 +48,7 @@
37+ // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
38+ // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
39+ // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
40+-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
41++// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
42+ // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"
43+
44+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
45+@@ -61,7 +61,7 @@
46+ // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
47+ // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
48+ // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"
49+-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
50++// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
51+ // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"
52+
53+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \