relax hexagon-toolchain.c even more to accomodate mingw32 targets

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

1 files changed, 143 insertions, 143 deletions

diff --git a/test/Driver/hexagon-toolchain.c b/test/Driver/hexagon-toolchain.c
index 0d4df783fb..d05da385a2 100644
--- a/test/Driver/hexagon-toolchain.c
+++ b/test/Driver/hexagon-toolchain.c
@@ -11,9 +11,9 @@
 // RUN:   -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK001 %s
-// CHECK001: "-cc1" {{.*}} "-internal-externc-isystem" "[[INSTALL_DIR:.*]]/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
-// CHECK001:   "-internal-externc-isystem" "[[INSTALL_DIR]]/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
-// CHECK001:   "-internal-externc-isystem" "[[INSTALL_DIR]]/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
+// CHECK001: "-cc1" {{.*}} "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
+// CHECK001:   "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
+// CHECK001:   "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
 // CHECK001-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
 
 // RUN: %clang -ccc-cxx -x c++ -### -target hexagon-unknown-linux     \
@@ -21,9 +21,9 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK002 %s
 // CHECK002: "-cc1" {{.*}} "-internal-isystem" "[[INSTALL_DIR:.*]]/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include/c++/4.4.0"
-// CHECK002:   "-internal-externc-isystem" "[[INSTALL_DIR]]/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
-// CHECK002:   "-internal-externc-isystem" "[[INSTALL_DIR]]/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
-// CHECK002:   "-internal-externc-isystem" "[[INSTALL_DIR]]/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
+// CHECK002:   "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
+// CHECK002:   "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
+// CHECK002:   "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
 // CHECK002-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
 
 // -----------------------------------------------------------------------------
@@ -123,21 +123,21 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK011 %s
 // CHECK011: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK011-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK011-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK011-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK011-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK011-NOT: "-static"
 // CHECK011-NOT: "-shared"
-// CHECK011: "[[GNU_DIR]]/hexagon/lib/v4/crt0_standalone.o"
-// CHECK011: "[[GNU_DIR]]/hexagon/lib/v4/crt0.o"
-// CHECK011: "[[GNU_DIR]]/hexagon/lib/v4/init.o"
-// CHECK011: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK011: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK011: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK011: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK011: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK011: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
+// CHECK011: "{{.*}}/hexagon/lib/v4/crt0.o"
+// CHECK011: "{{.*}}/hexagon/lib/v4/init.o"
+// CHECK011: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK011: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK011: "-L{{.*}}/lib/gcc"
+// CHECK011: "-L{{.*}}/hexagon/lib/v4"
+// CHECK011: "-L{{.*}}/hexagon/lib"
 // CHECK011: "{{[^"]+}}.o"
 // CHECK011: "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
-// CHECK011: "[[GNU_DIR]]/hexagon/lib/v4/fini.o"
+// CHECK011: "{{.*}}/hexagon/lib/v4/fini.o"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // Defaults for C++
@@ -147,22 +147,22 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK012 %s
 // CHECK012: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK012-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK012-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK012-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK012-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK012-NOT: "-static"
 // CHECK012-NOT: "-shared"
-// CHECK012: "[[GNU_DIR]]/hexagon/lib/v4/crt0_standalone.o"
-// CHECK012: "[[GNU_DIR]]/hexagon/lib/v4/crt0.o"
-// CHECK012: "[[GNU_DIR]]/hexagon/lib/v4/init.o"
-// CHECK012: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK012: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK012: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK012: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK012: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK012: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
+// CHECK012: "{{.*}}/hexagon/lib/v4/crt0.o"
+// CHECK012: "{{.*}}/hexagon/lib/v4/init.o"
+// CHECK012: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK012: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK012: "-L{{.*}}/lib/gcc"
+// CHECK012: "-L{{.*}}/hexagon/lib/v4"
+// CHECK012: "-L{{.*}}/hexagon/lib"
 // CHECK012: "{{[^"]+}}.o"
 // CHECK012: "-lstdc++" "-lm"
 // CHECK012: "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
-// CHECK012: "[[GNU_DIR]]/hexagon/lib/v4/fini.o"
+// CHECK012: "{{.*}}/hexagon/lib/v4/fini.o"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // Additional Libraries (-L)
@@ -173,20 +173,20 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK013 %s
 // CHECK013: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK013-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK013-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
-// CHECK013: "[[GNU_DIR]]/hexagon/lib/v4/crt0_standalone.o"
-// CHECK013: "[[GNU_DIR]]/hexagon/lib/v4/crt0.o"
-// CHECK013: "[[GNU_DIR]]/hexagon/lib/v4/init.o"
+// CHECK013-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK013-NEXT: "{{.*}}/bin/hexagon-ld"
+// CHECK013: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
+// CHECK013: "{{.*}}/hexagon/lib/v4/crt0.o"
+// CHECK013: "{{.*}}/hexagon/lib/v4/init.o"
 // CHECK013: "-Lone" "-Ltwo" "-Lthree"
-// CHECK013: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK013: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK013: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK013: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK013: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK013: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK013: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK013: "-L{{.*}}/lib/gcc"
+// CHECK013: "-L{{.*}}/hexagon/lib/v4"
+// CHECK013: "-L{{.*}}/hexagon/lib"
 // CHECK013: "{{[^"]+}}.o"
 // CHECK013: "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
-// CHECK013: "[[GNU_DIR]]/hexagon/lib/v4/fini.o"
+// CHECK013: "{{.*}}/hexagon/lib/v4/fini.o"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // -static, -shared
@@ -197,20 +197,20 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK014 %s
 // CHECK014: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK014-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK014-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK014-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK014-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK014: "-static"
-// CHECK014: "[[GNU_DIR]]/hexagon/lib/v4/crt0_standalone.o"
-// CHECK014: "[[GNU_DIR]]/hexagon/lib/v4/crt0.o"
-// CHECK014: "[[GNU_DIR]]/hexagon/lib/v4/init.o"
-// CHECK014: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK014: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK014: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK014: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK014: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK014: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
+// CHECK014: "{{.*}}/hexagon/lib/v4/crt0.o"
+// CHECK014: "{{.*}}/hexagon/lib/v4/init.o"
+// CHECK014: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK014: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK014: "-L{{.*}}/lib/gcc"
+// CHECK014: "-L{{.*}}/hexagon/lib/v4"
+// CHECK014: "-L{{.*}}/hexagon/lib"
 // CHECK014: "{{[^"]+}}.o"
 // CHECK014: "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
-// CHECK014: "[[GNU_DIR]]/hexagon/lib/v4/fini.o"
+// CHECK014: "{{.*}}/hexagon/lib/v4/fini.o"
 
 // RUN: %clang -### -target hexagon-unknown-linux     \
 // RUN:   -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
@@ -218,28 +218,28 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK015 %s
 // CHECK015: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK015-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK015-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK015-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK015-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK015: "-shared" "-call_shared"
 // CHECK015-NOT: crt0_standalone.o
 // CHECK015-NOT: crt0.o
-// CHECK015: "[[GNU_DIR]]/hexagon/lib/v4/G0/initS.o"
-// CHECK015: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4/G0"
-// CHECK015: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/G0"
-// CHECK015: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK015: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK015: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK015: "-L[[GNU_DIR]]/hexagon/lib/v4/G0"
-// CHECK015: "-L[[GNU_DIR]]/hexagon/lib/G0"
-// CHECK015: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK015: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK015: "{{.*}}/hexagon/lib/v4/G0/initS.o"
+// CHECK015: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4/G0"
+// CHECK015: "-L{{.*}}/lib/gcc/hexagon/4.4.0/G0"
+// CHECK015: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK015: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK015: "-L{{.*}}/lib/gcc"
+// CHECK015: "-L{{.*}}/hexagon/lib/v4/G0"
+// CHECK015: "-L{{.*}}/hexagon/lib/G0"
+// CHECK015: "-L{{.*}}/hexagon/lib/v4"
+// CHECK015: "-L{{.*}}/hexagon/lib"
 // CHECK015: "{{[^"]+}}.o"
 // CHECK015: "--start-group"
 // CHECK015-NOT: "-lstandalone"
 // CHECK015-NOT: "-lc"
 // CHECK015: "-lgcc"
 // CHECK015: "--end-group"
-// CHECK015: "[[GNU_DIR]]/hexagon/lib/v4/G0/finiS.o"
+// CHECK015: "{{.*}}/hexagon/lib/v4/G0/finiS.o"
 
 // RUN: %clang -### -target hexagon-unknown-linux     \
 // RUN:   -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
@@ -248,28 +248,28 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK016 %s
 // CHECK016: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK016-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK016-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK016-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK016-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK016: "-shared" "-call_shared" "-static"
 // CHECK016-NOT: crt0_standalone.o
 // CHECK016-NOT: crt0.o
-// CHECK016: "[[GNU_DIR]]/hexagon/lib/v4/G0/init.o"
-// CHECK016: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4/G0"
-// CHECK016: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/G0"
-// CHECK016: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK016: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK016: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK016: "-L[[GNU_DIR]]/hexagon/lib/v4/G0"
-// CHECK016: "-L[[GNU_DIR]]/hexagon/lib/G0"
-// CHECK016: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK016: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK016: "{{.*}}/hexagon/lib/v4/G0/init.o"
+// CHECK016: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4/G0"
+// CHECK016: "-L{{.*}}/lib/gcc/hexagon/4.4.0/G0"
+// CHECK016: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK016: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK016: "-L{{.*}}/lib/gcc"
+// CHECK016: "-L{{.*}}/hexagon/lib/v4/G0"
+// CHECK016: "-L{{.*}}/hexagon/lib/G0"
+// CHECK016: "-L{{.*}}/hexagon/lib/v4"
+// CHECK016: "-L{{.*}}/hexagon/lib"
 // CHECK016: "{{[^"]+}}.o"
 // CHECK016: "--start-group"
 // CHECK016-NOT: "-lstandalone"
 // CHECK016-NOT: "-lc"
 // CHECK016: "-lgcc"
 // CHECK016: "--end-group"
-// CHECK016: "[[GNU_DIR]]/hexagon/lib/v4/G0/fini.o"
+// CHECK016: "{{.*}}/hexagon/lib/v4/G0/fini.o"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // -nostdlib, -nostartfiles, -nodefaultlibs
@@ -280,16 +280,16 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK017 %s
 // CHECK017: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK017-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK017-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK017-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK017-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK017-NOT: crt0_standalone.o
 // CHECK017-NOT: crt0.o
 // CHECK017-NOT: init.o
-// CHECK017: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK017: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK017: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK017: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK017: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK017: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK017: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK017: "-L{{.*}}/lib/gcc"
+// CHECK017: "-L{{.*}}/hexagon/lib/v4"
+// CHECK017: "-L{{.*}}/hexagon/lib"
 // CHECK017: "{{[^"]+}}.o"
 // CHECK017-NOT: "-lstdc++"
 // CHECK017-NOT: "-lm"
@@ -306,16 +306,16 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK018 %s
 // CHECK018: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK018-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK018-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK018-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK018-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK018-NOT: crt0_standalone.o
 // CHECK018-NOT: crt0.o
 // CHECK018-NOT: init.o
-// CHECK018: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK018: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK018: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK018: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK018: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK018: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK018: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK018: "-L{{.*}}/lib/gcc"
+// CHECK018: "-L{{.*}}/hexagon/lib/v4"
+// CHECK018: "-L{{.*}}/hexagon/lib"
 // CHECK018: "{{[^"]+}}.o"
 // CHECK018: "-lstdc++"
 // CHECK018: "-lm"
@@ -332,16 +332,16 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK019 %s
 // CHECK019: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK019-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK019-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
-// CHECK019: "[[GNU_DIR]]/hexagon/lib/v4/crt0_standalone.o"
-// CHECK019: "[[GNU_DIR]]/hexagon/lib/v4/crt0.o"
-// CHECK019: "[[GNU_DIR]]/hexagon/lib/v4/init.o"
-// CHECK019: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK019: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK019: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK019: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK019: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK019-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK019-NEXT: "{{.*}}/bin/hexagon-ld"
+// CHECK019: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
+// CHECK019: "{{.*}}/hexagon/lib/v4/crt0.o"
+// CHECK019: "{{.*}}/hexagon/lib/v4/init.o"
+// CHECK019: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK019: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK019: "-L{{.*}}/lib/gcc"
+// CHECK019: "-L{{.*}}/hexagon/lib/v4"
+// CHECK019: "-L{{.*}}/hexagon/lib"
 // CHECK019: "{{[^"]+}}.o"
 // CHECK019-NOT: "-lstdc++"
 // CHECK019-NOT: "-lm"
@@ -350,7 +350,7 @@
 // CHECK019-NOT: "-lc"
 // CHECK019-NOT: "-lgcc"
 // CHECK019-NOT: "--end-group"
-// CHECK019: "[[GNU_DIR]]/hexagon/lib/v4/fini.o"
+// CHECK019: "{{.*}}/hexagon/lib/v4/fini.o"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // -moslib
@@ -361,24 +361,24 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK020 %s
 // CHECK020: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK020-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK020-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK020-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK020-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK020-NOT: "-static"
 // CHECK020-NOT: "-shared"
 // CHECK020-NOT: crt0_standalone.o
-// CHECK020: "[[GNU_DIR]]/hexagon/lib/v4/crt0.o"
-// CHECK020: "[[GNU_DIR]]/hexagon/lib/v4/init.o"
-// CHECK020: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK020: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK020: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK020: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK020: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK020: "{{.*}}/hexagon/lib/v4/crt0.o"
+// CHECK020: "{{.*}}/hexagon/lib/v4/init.o"
+// CHECK020: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK020: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK020: "-L{{.*}}/lib/gcc"
+// CHECK020: "-L{{.*}}/hexagon/lib/v4"
+// CHECK020: "-L{{.*}}/hexagon/lib"
 // CHECK020: "{{[^"]+}}.o"
 // CHECK020: "--start-group"
 // CHECK020: "-lfirst" "-lsecond"
 // CHECK020-NOT: "-lstandalone"
 // CHECK020: "-lc" "-lgcc" "--end-group"
-// CHECK020: "[[GNU_DIR]]/hexagon/lib/v4/fini.o"
+// CHECK020: "{{.*}}/hexagon/lib/v4/fini.o"
 
 // RUN: %clang -### -target hexagon-unknown-linux     \
 // RUN:   -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
@@ -386,24 +386,24 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK021 %s
 // CHECK021: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK021-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK021-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK021-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK021-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK021-NOT: "-static"
 // CHECK021-NOT: "-shared"
-// CHECK021: "[[GNU_DIR]]/hexagon/lib/v4/crt0_standalone.o"
-// CHECK021: "[[GNU_DIR]]/hexagon/lib/v4/crt0.o"
-// CHECK021: "[[GNU_DIR]]/hexagon/lib/v4/init.o"
-// CHECK021: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK021: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK021: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK021: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK021: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK021: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
+// CHECK021: "{{.*}}/hexagon/lib/v4/crt0.o"
+// CHECK021: "{{.*}}/hexagon/lib/v4/init.o"
+// CHECK021: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK021: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK021: "-L{{.*}}/lib/gcc"
+// CHECK021: "-L{{.*}}/hexagon/lib/v4"
+// CHECK021: "-L{{.*}}/hexagon/lib"
 // CHECK021: "{{[^"]+}}.o"
 // CHECK021: "--start-group"
 // CHECK021: "-lfirst" "-lsecond"
 // CHECK021: "-lstandalone"
 // CHECK021: "-lc" "-lgcc" "--end-group"
-// CHECK021: "[[GNU_DIR]]/hexagon/lib/v4/fini.o"
+// CHECK021: "{{.*}}/hexagon/lib/v4/fini.o"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // Other args to pass to linker
@@ -418,16 +418,16 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK022 %s
 // CHECK022: "{{.*}}clang{{.*}}" "-cc1"
-// CHECK022-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"{{.*}}
-// CHECK022-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
-// CHECK022: "[[GNU_DIR]]/hexagon/lib/v4/crt0_standalone.o"
-// CHECK022: "[[GNU_DIR]]/hexagon/lib/v4/crt0.o"
-// CHECK022: "[[GNU_DIR]]/hexagon/lib/v4/init.o"
-// CHECK022: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0/v4"
-// CHECK022: "-L[[GNU_DIR]]/lib/gcc/hexagon/4.4.0"
-// CHECK022: "-L[[GNU_DIR]]/lib/gcc"
-// CHECK022: "-L[[GNU_DIR]]/hexagon/lib/v4"
-// CHECK022: "-L[[GNU_DIR]]/hexagon/lib"
+// CHECK022-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
+// CHECK022-NEXT: "{{.*}}/bin/hexagon-ld"
+// CHECK022: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
+// CHECK022: "{{.*}}/hexagon/lib/v4/crt0.o"
+// CHECK022: "{{.*}}/hexagon/lib/v4/init.o"
+// CHECK022: "-L{{.*}}/lib/gcc/hexagon/4.4.0/v4"
+// CHECK022: "-L{{.*}}/lib/gcc/hexagon/4.4.0"
+// CHECK022: "-L{{.*}}/lib/gcc"
+// CHECK022: "-L{{.*}}/hexagon/lib/v4"
+// CHECK022: "-L{{.*}}/hexagon/lib"
 // CHECK022: "-Tbss" "0xdead" "-Tdata" "0xbeef" "-Ttext" "0xcafe"
 // CHECK022: "-s"
 // CHECK022: "-t"
@@ -435,7 +435,7 @@
 // CHECK022: "{{[^"]+}}.o"
 // CHECK022: "-lstdc++" "-lm"
 // CHECK022: "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
-// CHECK022: "[[GNU_DIR]]/hexagon/lib/v4/fini.o"
+// CHECK022: "{{.*}}/hexagon/lib/v4/fini.o"
 
 // -----------------------------------------------------------------------------
 // pic, small data threshold
@@ -446,9 +446,9 @@
 // RUN:   | FileCheck -check-prefix=CHECK023 %s
 // CHECK023:      "{{.*}}clang{{.*}}" "-cc1"
 // CHECK023:        "-mrelocation-model" "static"
-// CHECK023-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"
+// CHECK023-NEXT: "{{.*}}/bin/hexagon-as"
 // CHECK023-NOT:    "-G{{[0-9]+}}"
-// CHECK023-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK023-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK023-NOT:    "-G{{[0-9]+}}"
 
 // RUN: %clang -### -target hexagon-unknown-linux     \
@@ -471,9 +471,9 @@
 // CHECK024-NOT:    "-mrelocation-model" "static"
 // CHECK024:        "-pic-level" "{{[12]}}"
 // CHECK024:        "-mllvm" "-hexagon-small-data-threshold=0"
-// CHECK024-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"
+// CHECK024-NEXT: "{{.*}}/bin/hexagon-as"
 // CHECK024:        "-G0"
-// CHECK024-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK024-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK024:        "-G0"
 
 // RUN: %clang -### -target hexagon-unknown-linux     \
@@ -494,9 +494,9 @@
 // CHECK025:      "{{.*}}clang{{.*}}" "-cc1"
 // CHECK025:        "-mrelocation-model" "static"
 // CHECK025:        "-mllvm" "-hexagon-small-data-threshold=8"
-// CHECK025-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"
+// CHECK025-NEXT: "{{.*}}/bin/hexagon-as"
 // CHECK025:        "-G8"
-// CHECK025-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK025-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK025:        "-G8"
 
 // -----------------------------------------------------------------------------
@@ -508,8 +508,8 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK026 %s
 // CHECK026:      "{{.*}}clang{{.*}}" "-cc1"
-// CHECK026-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"
-// CHECK026-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK026-NEXT: "{{.*}}/bin/hexagon-as"
+// CHECK026-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK026:        "-pie"
 
 // RUN: %clang -### -target hexagon-unknown-linux     \
@@ -518,6 +518,6 @@
 // RUN:   %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK027 %s
 // CHECK027:      "{{.*}}clang{{.*}}" "-cc1"
-// CHECK027-NEXT: "[[GNU_DIR:.*]]/bin/hexagon-as"
-// CHECK027-NEXT: "[[GNU_DIR]]/bin/hexagon-ld"
+// CHECK027-NEXT: "{{.*}}/bin/hexagon-as"
+// CHECK027-NEXT: "{{.*}}/bin/hexagon-ld"
 // CHECK027-NOT:    "-pie"