As I suspected, completely non-multilib machines just get no suffix.

Make the suffixes optional everywhere, and just make sure they have the
right value. The suffixes aren't the interesting part of this test
anyways.

Sorry for the churn as I let the bots try out various patterns.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140927 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c
index b1a0d6880b18bfb909d7879a55ff728724d8b94c..bdf699ae1ba0b810039bc27062eb23cb8ec86a1a 100644 (file)
--- a/test/Driver/linux-ld.c
+++ b/test/Driver/linux-ld.c
@@ -2,10 +2,8 @@
 //
 // RUN: %clang -no-canonical-prefixes -ccc-host-triple i386-unknown-linux %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-LD-32 %s
-// 32-bit machines may use 'lib' or 'lib32' dependending on how they setup multilib.
 // CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" {{.*}} "-L/lib/../lib{{(32)?}}" "-L/usr/lib/../lib{{(32)?}}"
 //
 // RUN: %clang -no-canonical-prefixes -ccc-host-triple x86_64-unknown-linux %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-LD-64 %s
-// FIXME: Should we allow 'lib' instead of 'lib64' here?
-// CHECK-LD-64: "{{.*}}ld{{(.exe)?}}" {{.*}} "-L/lib/../lib64" "-L/usr/lib/../lib64"
+// CHECK-LD-64: "{{.*}}ld{{(.exe)?}}" {{.*}} "-L/lib/../lib{{(64)?}}" "-L/usr/lib/../lib{{(64)?}}"