<div><div dir="auto">LGTM</div><div dir="auto"><br></div><div dir="auto">Jon</div><br><div class="gmail_quote"><div dir="ltr">On Thu, Jul 26, 2018 at 10:12 PM David Greene via Phabricator <<a href="mailto:reviews@reviews.llvm.org">reviews@reviews.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">greened created this revision.<br>
greened added reviewers: jroelofs, hans, probinson, ismail, rtrieu.<br>
Herald added a subscriber: cfe-commits.<br>
<br>
This test fails if clang is configure with, for example, gold as the default linker.  It does not appear that this test really relies on lld so make the checks accept ld, ld.gold and ld.bfd too.<br>
<br>
<br>
Repository:<br>
  rC Clang<br>
<br>
<a href="https://reviews.llvm.org/D49898" rel="noreferrer" target="_blank">https://reviews.llvm.org/D49898</a><br>
<br>
Files:<br>
  test/Driver/baremetal.cpp<br>
<br>
<br>
Index: test/Driver/baremetal.cpp<br>
===================================================================<br>
--- test/Driver/baremetal.cpp<br>
+++ test/Driver/baremetal.cpp<br>
@@ -10,7 +10,7 @@<br>
 // CHECK-V6M-C-SAME: "-internal-isystem" "[[SYSROOT]]{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1"<br>
 // CHECk-V6M-C-SAME: "-internal-isystem" "[[SYSROOT]]{{[/\\]+}}include"<br>
 // CHECK-V6M-C-SAME: "-x" "c++" "{{.*}}baremetal.cpp"<br>
-// CHECK-V6M-C-NEXT: "{{[^"]*}}ld.lld{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
+// CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
 // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"<br>
 // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"<br>
 // CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"<br>
@@ -32,7 +32,7 @@<br>
 // RUN:     -target armv6m-none-eabi \<br>
 // RUN:     --sysroot=%S/Inputs/baremetal_arm \<br>
 // RUN:   | FileCheck --check-prefix=CHECK-V6M-DEFAULTCXX %s<br>
-// CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld.lld{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
+// CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
 // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"<br>
 // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"<br>
 // CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"<br>
@@ -45,7 +45,7 @@<br>
 // RUN:   | FileCheck --check-prefix=CHECK-V6M-LIBCXX %s<br>
 // CHECK-V6M-LIBCXX-NOT: "-internal-isystem" "{{[^"]+}}{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}{{[^v].*}}"<br>
 // CHECK-V6M-LIBCXX: "-internal-isystem" "{{[^"]+}}{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1"<br>
-// CHECK-V6M-LIBCXX: "{{[^"]*}}ld.lld{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
+// CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
 // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"<br>
 // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"<br>
 // CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"<br>
@@ -58,7 +58,7 @@<br>
 // RUN:   | FileCheck --check-prefix=CHECK-V6M-LIBSTDCXX %s<br>
 // CHECK-V6M-LIBSTDCXX-NOT: "-internal-isystem" "{{[^"]+}}{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1"<br>
 // CHECK-V6M-LIBSTDCXX: "-internal-isystem" "{{[^"]+}}{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}6.0.0"<br>
-// CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld.lld{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
+// CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
 // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"<br>
 // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"<br>
 // CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"<br>
@@ -69,7 +69,7 @@<br>
 // RUN:     --sysroot=%S/Inputs/baremetal_arm \<br>
 // RUN:     -nodefaultlibs \<br>
 // RUN:   | FileCheck --check-prefix=CHECK-V6M-NDL %s<br>
-// CHECK-V6M-NDL: "{{[^"]*}}ld.lld{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
+// CHECK-V6M-NDL: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"<br>
 // CHECK-V6M-NDL-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal" "-o" "{{.*}}.o"<br>
<br>
 // RUN: %clangxx -target arm-none-eabi -v 2>&1 \<br>
<br>
<br>
</blockquote></div></div>