r184790 - Accept both / and \\ to fix the windows bots.
jahanian
fjahanian at apple.com
Mon Jun 24 16:20:56 PDT 2013
We are green again.
- Thank You.
On Jun 24, 2013, at 3:07 PM, Rafael Espindola <rafael.espindola at gmail.com> wrote:
> Author: rafael
> Date: Mon Jun 24 17:07:15 2013
> New Revision: 184790
>
> URL: http://llvm.org/viewvc/llvm-project?rev=184790&view=rev
> Log:
> Accept both / and \\ to fix the windows bots.
>
> Modified:
> cfe/trunk/test/Driver/B-opt.c
> cfe/trunk/test/Driver/cross-linux-tools.c
> cfe/trunk/test/Driver/gcc-toolchain.cpp
> cfe/trunk/test/Driver/hexagon-toolchain-elf.c
> cfe/trunk/test/Driver/hexagon-toolchain.c
> cfe/trunk/test/Driver/linux-ld.c
> cfe/trunk/test/Driver/mips-cs-ld.c
> cfe/trunk/test/Driver/montavista-gcc-toolchain.c
> cfe/trunk/test/Preprocessor/iwithprefix.c
>
> Modified: cfe/trunk/test/Driver/B-opt.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/B-opt.c?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/B-opt.c (original)
> +++ cfe/trunk/test/Driver/B-opt.c Mon Jun 24 17:07:15 2013
> @@ -3,20 +3,20 @@
> // RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
> // RUN: -B %S/Inputs/B_opt_tree/dir1 2>&1 \
> // RUN: | FileCheck --check-prefix=CHECK-B-OPT-TRIPLE %s
> -// CHECK-B-OPT-TRIPLE: "{{.*}}/Inputs/B_opt_tree/dir1/i386-unknown-linux-ld"
> +// CHECK-B-OPT-TRIPLE: "{{.*}}/Inputs/B_opt_tree/dir1{{/|\\}}i386-unknown-linux-ld"
> //
> // RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
> // RUN: -B %S/Inputs/B_opt_tree/dir2 2>&1 \
> // RUN: | FileCheck --check-prefix=CHECK-B-OPT-DIR %s
> -// CHECK-B-OPT-DIR: "{{.*}}/Inputs/B_opt_tree/dir2/ld"
> +// CHECK-B-OPT-DIR: "{{.*}}/Inputs/B_opt_tree/dir2{{/|\\}}ld"
> //
> // RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
> // RUN: -B %S/Inputs/B_opt_tree/dir3/prefix- 2>&1 \
> // RUN: | FileCheck --check-prefix=CHECK-B-OPT-PREFIX %s
> -// CHECK-B-OPT-PREFIX: "{{.*}}/Inputs/B_opt_tree/dir3/prefix-ld"
> +// CHECK-B-OPT-PREFIX: "{{.*}}/Inputs/B_opt_tree/dir3{{/|\\}}prefix-ld"
> //
> // RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
> // RUN: -B %S/Inputs/B_opt_tree/dir3/prefix- \
> // RUN: -B %S/Inputs/B_opt_tree/dir2 2>&1 \
> // RUN: | FileCheck --check-prefix=CHECK-B-OPT-MULT %s
> -// CHECK-B-OPT-MULT: "{{.*}}/Inputs/B_opt_tree/dir3/prefix-ld"
> +// CHECK-B-OPT-MULT: "{{.*}}/Inputs/B_opt_tree/dir3{{/|\\}}prefix-ld"
>
> Modified: cfe/trunk/test/Driver/cross-linux-tools.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cross-linux-tools.c?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/cross-linux-tools.c (original)
> +++ cfe/trunk/test/Driver/cross-linux-tools.c Mon Jun 24 17:07:15 2013
> @@ -3,16 +3,16 @@
> // RUN: --target=i386-unknown-linux-gnu \
> // RUN: | FileCheck --check-prefix=CHECK-I386 %s
> // CHECK-I386: "-cc1" "-triple" "i386-unknown-linux-gnu"
> -// CHECK-I386: "{{.*}}/Inputs/basic_cross_linux_tree/usr/lib/gcc/i386-unknown-linux-gnu/4.6.0/../../../../i386-unknown-linux-gnu/bin/as" "--32"
> -// CHECK-I386: "{{.*}}/Inputs/basic_cross_linux_tree/usr/lib/gcc/i386-unknown-linux-gnu/4.6.0/../../../../i386-unknown-linux-gnu/bin/ld" {{.*}} "-m" "elf_i386"
> +// CHECK-I386: "{{.*}}/Inputs/basic_cross_linux_tree/usr/lib/gcc/i386-unknown-linux-gnu/4.6.0/../../../../i386-unknown-linux-gnu/bin{{/|\\}}as" "--32"
> +// CHECK-I386: "{{.*}}/Inputs/basic_cross_linux_tree/usr/lib/gcc/i386-unknown-linux-gnu/4.6.0/../../../../i386-unknown-linux-gnu/bin{{/|\\}}ld" {{.*}} "-m" "elf_i386"
> //
> // RUN: %clang -### -o %t %s 2>&1 -no-integrated-as \
> // RUN: --gcc-toolchain=%S/Inputs/basic_cross_linux_tree/usr \
> // RUN: --target=x86_64-unknown-linux-gnu \
> // RUN: | FileCheck --check-prefix=CHECK-X86-64 %s
> // CHECK-X86-64: "-cc1" "-triple" "x86_64-unknown-linux-gnu"
> -// CHECK-X86-64: "{{.*}}/Inputs/basic_cross_linux_tree/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6.0/../../../../x86_64-unknown-linux-gnu/bin/as" "--64"
> -// CHECK-X86-64: "{{.*}}/Inputs/basic_cross_linux_tree/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6.0/../../../../x86_64-unknown-linux-gnu/bin/ld" {{.*}} "-m" "elf_x86_64"
> +// CHECK-X86-64: "{{.*}}/Inputs/basic_cross_linux_tree/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6.0/../../../../x86_64-unknown-linux-gnu/bin{{/|\\}}as" "--64"
> +// CHECK-X86-64: "{{.*}}/Inputs/basic_cross_linux_tree/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6.0/../../../../x86_64-unknown-linux-gnu/bin{{/|\\}}ld" {{.*}} "-m" "elf_x86_64"
> //
> // RUN: %clang -### -o %t %s 2>&1 -no-integrated-as \
> // RUN: --gcc-toolchain=%S/Inputs/basic_cross_linux_tree/usr \
> @@ -29,29 +29,29 @@
> // RUN: --target=i386-unknown-linux \
> // RUN: | FileCheck --check-prefix=CHECK-MULTI32-I386 %s
> // CHECK-MULTI32-I386: "-cc1" "-triple" "i386-unknown-linux"
> -// CHECK-MULTI32-I386: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin/as" "--32"
> -// CHECK-MULTI32-I386: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin/ld" {{.*}} "-m" "elf_i386"
> +// CHECK-MULTI32-I386: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin{{/|\\}}as" "--32"
> +// CHECK-MULTI32-I386: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin{{/|\\}}ld" {{.*}} "-m" "elf_i386"
> //
> // RUN: %clang -### -o %t %s 2>&1 -no-integrated-as \
> // RUN: --gcc-toolchain=%S/Inputs/multilib_32bit_linux_tree/usr \
> // RUN: --target=x86_64-unknown-linux \
> // RUN: | FileCheck --check-prefix=CHECK-MULTI32-X86-64 %s
> // CHECK-MULTI32-X86-64: "-cc1" "-triple" "x86_64-unknown-linux"
> -// CHECK-MULTI32-X86-64: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin/as" "--64"
> -// CHECK-MULTI32-X86-64: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin/ld" {{.*}} "-m" "elf_x86_64"
> +// CHECK-MULTI32-X86-64: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin{{/|\\}}as" "--64"
> +// CHECK-MULTI32-X86-64: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin{{/|\\}}ld" {{.*}} "-m" "elf_x86_64"
> //
> // RUN: %clang -### -o %t %s 2>&1 -no-integrated-as \
> // RUN: --gcc-toolchain=%S/Inputs/multilib_64bit_linux_tree/usr \
> // RUN: --target=i386-unknown-linux \
> // RUN: | FileCheck --check-prefix=CHECK-MULTI64-I386 %s
> // CHECK-MULTI64-I386: "-cc1" "-triple" "i386-unknown-linux"
> -// CHECK-MULTI64-I386: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin/as" "--32"
> -// CHECK-MULTI64-I386: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin/ld" {{.*}} "-m" "elf_i386"
> +// CHECK-MULTI64-I386: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin{{/|\\}}as" "--32"
> +// CHECK-MULTI64-I386: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin{{/|\\}}ld" {{.*}} "-m" "elf_i386"
> //
> // RUN: %clang -### -o %t %s 2>&1 -no-integrated-as \
> // RUN: --gcc-toolchain=%S/Inputs/multilib_64bit_linux_tree/usr \
> // RUN: --target=x86_64-unknown-linux \
> // RUN: | FileCheck --check-prefix=CHECK-MULTI64-X86-64 %s
> // CHECK-MULTI64-X86-64: "-cc1" "-triple" "x86_64-unknown-linux"
> -// CHECK-MULTI64-X86-64: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin/as" "--64"
> -// CHECK-MULTI64-X86-64: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin/ld" {{.*}} "-m" "elf_x86_64"
> +// CHECK-MULTI64-X86-64: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin{{/|\\}}as" "--64"
> +// CHECK-MULTI64-X86-64: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin{{/|\\}}ld" {{.*}} "-m" "elf_x86_64"
>
> Modified: cfe/trunk/test/Driver/gcc-toolchain.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/gcc-toolchain.cpp?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/gcc-toolchain.cpp (original)
> +++ cfe/trunk/test/Driver/gcc-toolchain.cpp Mon Jun 24 17:07:15 2013
> @@ -24,6 +24,6 @@
> // the same precise formatting of the path as the '-internal-system' flags
> // above, so we just blanket wildcard match the 'crtbegin.o'.
> // CHECK: "{{[^"]*}}ld{{(.exe)?}}"
> -// CHECK: "{{[^"]*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/crtbegin.o"
> +// CHECK: "{{[^"]*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
> // CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5"
> // CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.."
>
> Modified: cfe/trunk/test/Driver/hexagon-toolchain-elf.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/hexagon-toolchain-elf.c?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/hexagon-toolchain-elf.c (original)
> +++ cfe/trunk/test/Driver/hexagon-toolchain-elf.c Mon Jun 24 17:07:15 2013
> @@ -11,7 +11,7 @@
> // 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"
> +// CHECK001-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // RUN: %clang -ccc-cxx -x c++ -### -target hexagon-unknown-elf \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -21,7 +21,7 @@
> // 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"
> +// CHECK002-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // -----------------------------------------------------------------------------
> // Test -nostdinc, -nostdlibinc, -nostdinc++
> @@ -36,7 +36,7 @@
> // CHECK003-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
> // CHECK003-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
> // CHECK003-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
> -// CHECK003-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
> +// CHECK003-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // RUN: %clang -### -target hexagon-unknown-elf \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -47,7 +47,7 @@
> // CHECK004-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
> // CHECK004-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
> // CHECK004-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
> -// CHECK004-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
> +// CHECK004-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // RUN: %clang -ccc-cxx -x c++ -### -target hexagon-unknown-elf \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -59,7 +59,7 @@
> // CHECK005-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
> // CHECK005-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
> // CHECK005-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
> -// CHECK005-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
> +// CHECK005-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // RUN: %clang -ccc-cxx -x c++ -### -target hexagon-unknown-elf \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -68,7 +68,7 @@
> // RUN: | FileCheck -check-prefix=CHECK006 %s
> // CHECK006: "-cc1"
> // CHECK006-NOT: "-internal-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include/c++/4.4.0"
> -// CHECK006-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
> +// CHECK006-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // -----------------------------------------------------------------------------
> // Test -march=<archname> -mcpu=<archname> -mv<number>
> @@ -79,8 +79,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK007 %s
> // CHECK007: "-cc1" {{.*}} "-target-cpu" "hexagonv3"
> -// CHECK007-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"{{.*}} "-march=v3"
> -// CHECK007-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-ld"{{.*}} "-mv3"
> +// CHECK007-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"{{.*}} "-march=v3"
> +// CHECK007-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-ld"{{.*}} "-mv3"
>
> // RUN: %clang -### -target hexagon-unknown-elf \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -88,8 +88,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK008 %s
> // CHECK008: "-cc1" {{.*}} "-target-cpu" "hexagonv5"
> -// CHECK008-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"{{.*}} "-march=v5"
> -// CHECK008-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-ld"{{.*}} "-mv5"
> +// CHECK008-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"{{.*}} "-march=v5"
> +// CHECK008-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-ld"{{.*}} "-mv5"
>
> // RUN: %clang -### -target hexagon-unknown-elf \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -97,16 +97,16 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK009 %s
> // CHECK009: "-cc1" {{.*}} "-target-cpu" "hexagonv2"
> -// CHECK009-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"{{.*}} "-march=v2"
> -// CHECK009-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-ld"{{.*}} "-mv2"
> +// CHECK009-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"{{.*}} "-march=v2"
> +// CHECK009-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-ld"{{.*}} "-mv2"
>
> // RUN: %clang -### -target hexagon-unknown-elf \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK010 %s
> // CHECK010: "-cc1" {{.*}} "-target-cpu" "hexagonv4"
> -// CHECK010-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"{{.*}} "-march=v4"
> -// CHECK010-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-ld"{{.*}} "-mv4"
> +// CHECK010-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"{{.*}} "-march=v4"
> +// CHECK010-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-ld"{{.*}} "-mv4"
>
> // RUN: %clang -march=hexagonv2 -target hexagon-unknown-elf \
> // RUN: %s 2>&1 | FileCheck -check-prefix=CHECK-UNKNOWN-V2 %s
> @@ -136,8 +136,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK011 %s
> // CHECK011: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK011-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK011-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK011-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK011-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK011-NOT: "-static"
> // CHECK011-NOT: "-shared"
> // CHECK011: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
> @@ -160,8 +160,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK012 %s
> // CHECK012: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK012-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK012-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK012-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK012-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK012-NOT: "-static"
> // CHECK012-NOT: "-shared"
> // CHECK012: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
> @@ -186,8 +186,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK013 %s
> // CHECK013: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK013-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK013-NEXT: "{{.*}}/bin/hexagon-ld"
> +// 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"
> @@ -210,8 +210,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK014 %s
> // CHECK014: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK014-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK014-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK014-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK014-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK014: "-static"
> // CHECK014: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
> // CHECK014: "{{.*}}/hexagon/lib/v4/crt0.o"
> @@ -231,8 +231,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK015 %s
> // CHECK015: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK015-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK015-NEXT: "{{.*}}/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
> @@ -261,8 +261,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK016 %s
> // CHECK016: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK016-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK016-NEXT: "{{.*}}/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
> @@ -293,8 +293,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK017 %s
> // CHECK017: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK017-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK017-NEXT: "{{.*}}/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
> @@ -319,8 +319,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK018 %s
> // CHECK018: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK018-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK018-NEXT: "{{.*}}/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
> @@ -345,8 +345,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK019 %s
> // CHECK019: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK019-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK019-NEXT: "{{.*}}/bin/hexagon-ld"
> +// 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"
> @@ -374,8 +374,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK020 %s
> // CHECK020: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK020-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK020-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK020-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK020-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK020-NOT: "-static"
> // CHECK020-NOT: "-shared"
> // CHECK020-NOT: crt0_standalone.o
> @@ -399,8 +399,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK021 %s
> // CHECK021: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK021-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK021-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK021-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK021-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK021-NOT: "-static"
> // CHECK021-NOT: "-shared"
> // CHECK021: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
> @@ -431,8 +431,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK022 %s
> // CHECK022: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK022-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK022-NEXT: "{{.*}}/bin/hexagon-ld"
> +// 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"
> @@ -459,9 +459,9 @@
> // RUN: | FileCheck -check-prefix=CHECK023 %s
> // CHECK023: "{{.*}}clang{{.*}}" "-cc1"
> // CHECK023: "-mrelocation-model" "static"
> -// CHECK023-NEXT: "{{.*}}/bin/hexagon-as"
> +// CHECK023-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> // CHECK023-NOT: "-G{{[0-9]+}}"
> -// CHECK023-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK023-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK023-NOT: "-G{{[0-9]+}}"
>
> // RUN: %clang -### -target hexagon-unknown-elf \
> @@ -484,9 +484,9 @@
> // CHECK024-NOT: "-mrelocation-model" "static"
> // CHECK024: "-pic-level" "{{[12]}}"
> // CHECK024: "-mllvm" "-hexagon-small-data-threshold=0"
> -// CHECK024-NEXT: "{{.*}}/bin/hexagon-as"
> +// CHECK024-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> // CHECK024: "-G0"
> -// CHECK024-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK024-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK024: "-G0"
>
> // RUN: %clang -### -target hexagon-unknown-elf \
> @@ -507,9 +507,9 @@
> // CHECK025: "{{.*}}clang{{.*}}" "-cc1"
> // CHECK025: "-mrelocation-model" "static"
> // CHECK025: "-mllvm" "-hexagon-small-data-threshold=8"
> -// CHECK025-NEXT: "{{.*}}/bin/hexagon-as"
> +// CHECK025-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> // CHECK025: "-G8"
> -// CHECK025-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK025-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK025: "-G8"
>
> // -----------------------------------------------------------------------------
> @@ -521,8 +521,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK026 %s
> // CHECK026: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK026-NEXT: "{{.*}}/bin/hexagon-as"
> -// CHECK026-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK026-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> +// CHECK026-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK026: "-pie"
>
> // RUN: %clang -### -target hexagon-unknown-elf \
> @@ -531,8 +531,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK027 %s
> // CHECK027: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK027-NEXT: "{{.*}}/bin/hexagon-as"
> -// CHECK027-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK027-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> +// CHECK027-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK027-NOT: "-pie"
>
> // -----------------------------------------------------------------------------
> @@ -545,8 +545,8 @@
> // CHECK028: "{{.*}}clang{{.*}}" "-cc1"
> // CHECK028: "-mqdsp6-compat"
> // CHECK028: "-Wreturn-type"
> -// CHECK028-NEXT: "{{.*}}/bin/hexagon-as"
> -// CHECK028-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK028-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> +// CHECK028-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
>
> // -----------------------------------------------------------------------------
> // Test Assembler related args
> @@ -559,6 +559,6 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK029 %s
> // CHECK029: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK029-NEXT: "{{.*}}/bin/hexagon-as"
> +// CHECK029-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> // CHECK029: "--noexecstack" "--trap" "--keep-locals"
> -// CHECK029-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK029-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
>
> Modified: cfe/trunk/test/Driver/hexagon-toolchain.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/hexagon-toolchain.c?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/hexagon-toolchain.c (original)
> +++ cfe/trunk/test/Driver/hexagon-toolchain.c Mon Jun 24 17:07:15 2013
> @@ -11,7 +11,7 @@
> // 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"
> +// CHECK001-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // RUN: %clang -ccc-cxx -x c++ -### -target hexagon-unknown-linux \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -21,7 +21,7 @@
> // 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"
> +// CHECK002-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // -----------------------------------------------------------------------------
> // Test -nostdinc, -nostdlibinc, -nostdinc++
> @@ -36,7 +36,7 @@
> // CHECK003-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
> // CHECK003-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
> // CHECK003-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
> -// CHECK003-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
> +// CHECK003-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // RUN: %clang -### -target hexagon-unknown-linux \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -47,7 +47,7 @@
> // CHECK004-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
> // CHECK004-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
> // CHECK004-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
> -// CHECK004-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
> +// CHECK004-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // RUN: %clang -ccc-cxx -x c++ -### -target hexagon-unknown-linux \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -59,7 +59,7 @@
> // CHECK005-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include"
> // CHECK005-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/lib/gcc/hexagon/4.4.0/include-fixed"
> // CHECK005-NOT: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include"
> -// CHECK005-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
> +// CHECK005-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // RUN: %clang -ccc-cxx -x c++ -### -target hexagon-unknown-linux \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -68,7 +68,7 @@
> // RUN: | FileCheck -check-prefix=CHECK006 %s
> // CHECK006: "-cc1"
> // CHECK006-NOT: "-internal-isystem" "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/hexagon/include/c++/4.4.0"
> -// CHECK006-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"
> +// CHECK006-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"
>
> // -----------------------------------------------------------------------------
> // Test -march=<archname> -mcpu=<archname> -mv<number>
> @@ -79,8 +79,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK007 %s
> // CHECK007: "-cc1" {{.*}} "-target-cpu" "hexagonv3"
> -// CHECK007-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"{{.*}} "-march=v3"
> -// CHECK007-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-ld"{{.*}} "-mv3"
> +// CHECK007-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"{{.*}} "-march=v3"
> +// CHECK007-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-ld"{{.*}} "-mv3"
>
> // RUN: %clang -### -target hexagon-unknown-linux \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -88,8 +88,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK008 %s
> // CHECK008: "-cc1" {{.*}} "-target-cpu" "hexagonv5"
> -// CHECK008-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"{{.*}} "-march=v5"
> -// CHECK008-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-ld"{{.*}} "-mv5"
> +// CHECK008-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"{{.*}} "-march=v5"
> +// CHECK008-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-ld"{{.*}} "-mv5"
>
> // RUN: %clang -### -target hexagon-unknown-linux \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> @@ -97,16 +97,16 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK009 %s
> // CHECK009: "-cc1" {{.*}} "-target-cpu" "hexagonv2"
> -// CHECK009-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"{{.*}} "-march=v2"
> -// CHECK009-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-ld"{{.*}} "-mv2"
> +// CHECK009-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"{{.*}} "-march=v2"
> +// CHECK009-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-ld"{{.*}} "-mv2"
>
> // RUN: %clang -### -target hexagon-unknown-linux \
> // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK010 %s
> // CHECK010: "-cc1" {{.*}} "-target-cpu" "hexagonv4"
> -// CHECK010-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-as"{{.*}} "-march=v4"
> -// CHECK010-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin/hexagon-ld"{{.*}} "-mv4"
> +// CHECK010-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-as"{{.*}} "-march=v4"
> +// CHECK010-NEXT: "{{.*}}/Inputs/hexagon_tree/qc/bin/../../gnu/bin{{/|\\}}hexagon-ld"{{.*}} "-mv4"
>
> // RUN: %clang -march=hexagonv2 -target hexagon-unknown-linux \
> // RUN: %s 2>&1 | FileCheck -check-prefix=CHECK-UNKNOWN-V2 %s
> @@ -136,8 +136,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK011 %s
> // CHECK011: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK011-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK011-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK011-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK011-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK011-NOT: "-static"
> // CHECK011-NOT: "-shared"
> // CHECK011: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
> @@ -160,8 +160,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK012 %s
> // CHECK012: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK012-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK012-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK012-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK012-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK012-NOT: "-static"
> // CHECK012-NOT: "-shared"
> // CHECK012: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
> @@ -186,8 +186,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK013 %s
> // CHECK013: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK013-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK013-NEXT: "{{.*}}/bin/hexagon-ld"
> +// 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"
> @@ -210,8 +210,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK014 %s
> // CHECK014: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK014-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK014-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK014-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK014-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK014: "-static"
> // CHECK014: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
> // CHECK014: "{{.*}}/hexagon/lib/v4/crt0.o"
> @@ -231,8 +231,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK015 %s
> // CHECK015: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK015-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK015-NEXT: "{{.*}}/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
> @@ -261,8 +261,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK016 %s
> // CHECK016: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK016-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK016-NEXT: "{{.*}}/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
> @@ -293,8 +293,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK017 %s
> // CHECK017: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK017-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK017-NEXT: "{{.*}}/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
> @@ -319,8 +319,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK018 %s
> // CHECK018: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK018-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK018-NEXT: "{{.*}}/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
> @@ -345,8 +345,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK019 %s
> // CHECK019: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK019-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK019-NEXT: "{{.*}}/bin/hexagon-ld"
> +// 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"
> @@ -374,8 +374,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK020 %s
> // CHECK020: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK020-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK020-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK020-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK020-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK020-NOT: "-static"
> // CHECK020-NOT: "-shared"
> // CHECK020-NOT: crt0_standalone.o
> @@ -399,8 +399,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK021 %s
> // CHECK021: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK021-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK021-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK021-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"{{.*}}
> +// CHECK021-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK021-NOT: "-static"
> // CHECK021-NOT: "-shared"
> // CHECK021: "{{.*}}/hexagon/lib/v4/crt0_standalone.o"
> @@ -431,8 +431,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK022 %s
> // CHECK022: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK022-NEXT: "{{.*}}/bin/hexagon-as"{{.*}}
> -// CHECK022-NEXT: "{{.*}}/bin/hexagon-ld"
> +// 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"
> @@ -459,9 +459,9 @@
> // RUN: | FileCheck -check-prefix=CHECK023 %s
> // CHECK023: "{{.*}}clang{{.*}}" "-cc1"
> // CHECK023: "-mrelocation-model" "static"
> -// CHECK023-NEXT: "{{.*}}/bin/hexagon-as"
> +// CHECK023-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> // CHECK023-NOT: "-G{{[0-9]+}}"
> -// CHECK023-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK023-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK023-NOT: "-G{{[0-9]+}}"
>
> // RUN: %clang -### -target hexagon-unknown-linux \
> @@ -484,9 +484,9 @@
> // CHECK024-NOT: "-mrelocation-model" "static"
> // CHECK024: "-pic-level" "{{[12]}}"
> // CHECK024: "-mllvm" "-hexagon-small-data-threshold=0"
> -// CHECK024-NEXT: "{{.*}}/bin/hexagon-as"
> +// CHECK024-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> // CHECK024: "-G0"
> -// CHECK024-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK024-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK024: "-G0"
>
> // RUN: %clang -### -target hexagon-unknown-linux \
> @@ -507,9 +507,9 @@
> // CHECK025: "{{.*}}clang{{.*}}" "-cc1"
> // CHECK025: "-mrelocation-model" "static"
> // CHECK025: "-mllvm" "-hexagon-small-data-threshold=8"
> -// CHECK025-NEXT: "{{.*}}/bin/hexagon-as"
> +// CHECK025-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> // CHECK025: "-G8"
> -// CHECK025-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK025-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK025: "-G8"
>
> // -----------------------------------------------------------------------------
> @@ -521,8 +521,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK026 %s
> // CHECK026: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK026-NEXT: "{{.*}}/bin/hexagon-as"
> -// CHECK026-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK026-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> +// CHECK026-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK026: "-pie"
>
> // RUN: %clang -### -target hexagon-unknown-linux \
> @@ -531,8 +531,8 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK027 %s
> // CHECK027: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK027-NEXT: "{{.*}}/bin/hexagon-as"
> -// CHECK027-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK027-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> +// CHECK027-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
> // CHECK027-NOT: "-pie"
>
> // -----------------------------------------------------------------------------
> @@ -545,8 +545,8 @@
> // CHECK028: "{{.*}}clang{{.*}}" "-cc1"
> // CHECK028: "-mqdsp6-compat"
> // CHECK028: "-Wreturn-type"
> -// CHECK028-NEXT: "{{.*}}/bin/hexagon-as"
> -// CHECK028-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK028-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> +// CHECK028-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
>
> // -----------------------------------------------------------------------------
> // Test Assembler related args
> @@ -559,6 +559,6 @@
> // RUN: %s 2>&1 \
> // RUN: | FileCheck -check-prefix=CHECK029 %s
> // CHECK029: "{{.*}}clang{{.*}}" "-cc1"
> -// CHECK029-NEXT: "{{.*}}/bin/hexagon-as"
> +// CHECK029-NEXT: "{{.*}}/bin{{/|\\}}hexagon-as"
> // CHECK029: "--noexecstack" "--trap" "--keep-locals"
> -// CHECK029-NEXT: "{{.*}}/bin/hexagon-ld"
> +// CHECK029-NEXT: "{{.*}}/bin{{/|\\}}hexagon-ld"
>
> Modified: cfe/trunk/test/Driver/linux-ld.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/linux-ld.c?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/linux-ld.c (original)
> +++ cfe/trunk/test/Driver/linux-ld.c Mon Jun 24 17:07:15 2013
> @@ -7,7 +7,7 @@
> // RUN: | FileCheck --check-prefix=CHECK-LD-32 %s
> // CHECK-LD-32-NOT: warning:
> // CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-LD-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0/crtbegin.o"
> +// CHECK-LD-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
> // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0"
> // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib"
> // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
> @@ -23,7 +23,7 @@
> // CHECK-LD-64: "--eh-frame-hdr"
> // CHECK-LD-64: "-m" "elf_x86_64"
> // CHECK-LD-64: "-dynamic-linker"
> -// CHECK-LD-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o"
> +// CHECK-LD-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
> // CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
> // CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
> // CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
> @@ -43,7 +43,7 @@
> // CHECK-LD-64-STATIC-LIBGCC: "--eh-frame-hdr"
> // CHECK-LD-64-STATIC-LIBGCC: "-m" "elf_x86_64"
> // CHECK-LD-64-STATIC-LIBGCC: "-dynamic-linker"
> -// CHECK-LD-64-STATIC-LIBGCC: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o"
> +// CHECK-LD-64-STATIC-LIBGCC: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
> // CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
> // CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
> // CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
> @@ -64,7 +64,7 @@
> // CHECK-LD-64-STATIC: "-m" "elf_x86_64"
> // CHECK-LD-64-STATIC-NOT: "-dynamic-linker"
> // CHECK-LD-64-STATIC: "-static"
> -// CHECK-LD-64-STATIC: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbeginT.o"
> +// CHECK-LD-64-STATIC: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbeginT.o"
> // CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
> // CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
> // CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
> @@ -84,7 +84,7 @@
> // RUN: --sysroot=%S/Inputs/multilib_32bit_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-32-TO-32 %s
> // CHECK-32-TO-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-32-TO-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0/crtbegin.o"
> +// CHECK-32-TO-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
> // CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0"
> // CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib/../lib32"
> // CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../lib32"
> @@ -100,7 +100,7 @@
> // RUN: --sysroot=%S/Inputs/multilib_32bit_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-32-TO-64 %s
> // CHECK-32-TO-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-32-TO-64: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0/64/crtbegin.o"
> +// CHECK-32-TO-64: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0/64{{/|\\\\}}crtbegin.o"
> // CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/64"
> // CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib/../lib64"
> // CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../lib64"
> @@ -117,7 +117,7 @@
> // RUN: --sysroot=%S/Inputs/multilib_64bit_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-64-TO-64 %s
> // CHECK-64-TO-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-64-TO-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o"
> +// CHECK-64-TO-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
> // CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
> // CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib/../lib64"
> // CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../lib64"
> @@ -133,7 +133,7 @@
> // RUN: --sysroot=%S/Inputs/multilib_64bit_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-64-TO-32 %s
> // CHECK-64-TO-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-64-TO-32: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32/crtbegin.o"
> +// CHECK-64-TO-32: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32{{/|\\\\}}crtbegin.o"
> // CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32"
> // CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib/../lib32"
> // CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../lib32"
> @@ -151,7 +151,7 @@
> // RUN: --sysroot=%S/Inputs/multilib_32bit_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-64-TO-32-SYSROOT %s
> // CHECK-64-TO-32-SYSROOT: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-64-TO-32-SYSROOT: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32/crtbegin.o"
> +// CHECK-64-TO-32-SYSROOT: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32{{/|\\\\}}crtbegin.o"
> // CHECK-64-TO-32-SYSROOT: "-L{{[^"]*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32"
> // CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/lib/../lib32"
> // CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/usr/lib/../lib32"
> @@ -165,7 +165,7 @@
> // RUN: --sysroot=%S/Inputs/basic_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-INSTALL-DIR-32 %s
> // CHECK-INSTALL-DIR-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-INSTALL-DIR-32: "{{.*}}/Inputs/fake_install_tree/bin/../lib/gcc/i386-unknown-linux/4.7.0/crtbegin.o"
> +// CHECK-INSTALL-DIR-32: "{{.*}}/Inputs/fake_install_tree/bin/../lib/gcc/i386-unknown-linux/4.7.0{{/|\\\\}}crtbegin.o"
> // CHECK-INSTALL-DIR-32: "-L{{.*}}/Inputs/fake_install_tree/bin/../lib/gcc/i386-unknown-linux/4.7.0"
> //
> // Check that with 64-bit builds, we don't actually use the install directory
> @@ -176,7 +176,7 @@
> // RUN: --sysroot=%S/Inputs/basic_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-INSTALL-DIR-64 %s
> // CHECK-INSTALL-DIR-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-INSTALL-DIR-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o"
> +// CHECK-INSTALL-DIR-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
> // CHECK-INSTALL-DIR-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
> //
> // Check that we support unusual patch version formats, including missing that
> @@ -187,7 +187,7 @@
> // RUN: --sysroot=%S/Inputs/basic_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-GCC-VERSION1 %s
> // CHECK-GCC-VERSION1: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-GCC-VERSION1: "{{.*}}/Inputs/gcc_version_parsing1/bin/../lib/gcc/i386-unknown-linux/4.7/crtbegin.o"
> +// CHECK-GCC-VERSION1: "{{.*}}/Inputs/gcc_version_parsing1/bin/../lib/gcc/i386-unknown-linux/4.7{{/|\\\\}}crtbegin.o"
> // CHECK-GCC-VERSION1: "-L{{.*}}/Inputs/gcc_version_parsing1/bin/../lib/gcc/i386-unknown-linux/4.7"
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> // RUN: --target=i386-unknown-linux -m32 \
> @@ -195,7 +195,7 @@
> // RUN: --sysroot=%S/Inputs/basic_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-GCC-VERSION2 %s
> // CHECK-GCC-VERSION2: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-GCC-VERSION2: "{{.*}}/Inputs/gcc_version_parsing2/bin/../lib/gcc/i386-unknown-linux/4.7.x/crtbegin.o"
> +// CHECK-GCC-VERSION2: "{{.*}}/Inputs/gcc_version_parsing2/bin/../lib/gcc/i386-unknown-linux/4.7.x{{/|\\\\}}crtbegin.o"
> // CHECK-GCC-VERSION2: "-L{{.*}}/Inputs/gcc_version_parsing2/bin/../lib/gcc/i386-unknown-linux/4.7.x"
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> // RUN: --target=i386-unknown-linux -m32 \
> @@ -203,7 +203,7 @@
> // RUN: --sysroot=%S/Inputs/basic_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-GCC-VERSION3 %s
> // CHECK-GCC-VERSION3: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-GCC-VERSION3: "{{.*}}/Inputs/gcc_version_parsing3/bin/../lib/gcc/i386-unknown-linux/4.7.99-rc5/crtbegin.o"
> +// CHECK-GCC-VERSION3: "{{.*}}/Inputs/gcc_version_parsing3/bin/../lib/gcc/i386-unknown-linux/4.7.99-rc5{{/|\\\\}}crtbegin.o"
> // CHECK-GCC-VERSION3: "-L{{.*}}/Inputs/gcc_version_parsing3/bin/../lib/gcc/i386-unknown-linux/4.7.99-rc5"
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> // RUN: --target=i386-unknown-linux -m32 \
> @@ -211,7 +211,7 @@
> // RUN: --sysroot=%S/Inputs/basic_linux_tree \
> // RUN: | FileCheck --check-prefix=CHECK-GCC-VERSION4 %s
> // CHECK-GCC-VERSION4: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-GCC-VERSION4: "{{.*}}/Inputs/gcc_version_parsing4/bin/../lib/gcc/i386-unknown-linux/4.7.99/crtbegin.o"
> +// CHECK-GCC-VERSION4: "{{.*}}/Inputs/gcc_version_parsing4/bin/../lib/gcc/i386-unknown-linux/4.7.99{{/|\\\\}}crtbegin.o"
> // CHECK-GCC-VERSION4: "-L{{.*}}/Inputs/gcc_version_parsing4/bin/../lib/gcc/i386-unknown-linux/4.7.99"
> //
> // Test a very broken version of multiarch that shipped in Ubuntu 11.04.
> @@ -220,7 +220,7 @@
> // RUN: --sysroot=%S/Inputs/ubuntu_11.04_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-UBUNTU-11-04 %s
> // CHECK-UBUNTU-11-04: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-UBUNTU-11-04: "{{.*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/crtbegin.o"
> +// CHECK-UBUNTU-11-04: "{{.*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
> // CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5"
> // CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../i386-linux-gnu"
> // CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu"
> @@ -234,16 +234,16 @@
> // RUN: --sysroot=%S/Inputs/ubuntu_12.04_LTS_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-UBUNTU-12-04-ARM-HF %s
> // CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf/crt1.o"
> -// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf/crti.o"
> -// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/crtbegin.o"
> +// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crt1.o"
> +// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crti.o"
> +// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3{{/|\\\\}}crtbegin.o"
> // CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3"
> // CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf"
> // CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/lib/arm-linux-gnueabihf"
> // CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/arm-linux-gnueabihf"
> // CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../.."
> -// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/crtend.o"
> -// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf/crtn.o"
> +// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3{{/|\\\\}}crtend.o"
> +// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crtn.o"
> //
> // Check fedora 18 on arm.
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -251,31 +251,31 @@
> // RUN: --sysroot=%S/Inputs/fedora_18_tree \
> // RUN: | FileCheck --check-prefix=CHECK-FEDORA-18-ARM-HF %s
> // CHECK-FEDORA-18-ARM-HF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../crt1.o"
> -// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../crti.o"
> -// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/crtbegin.o"
> +// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../..{{/|\\\\}}crt1.o"
> +// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../..{{/|\\\\}}crti.o"
> +// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2{{/|\\\\}}crtbegin.o"
> // CHECK-FEDORA-18-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2"
> // CHECK-FEDORA-18-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../.."
> // CHECK-FEDORA-18-ARM-HF: "-L[[SYSROOT]]/lib"
> // CHECK-FEDORA-18-ARM-HF: "-L[[SYSROOT]]/usr/lib"
> -// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/crtend.o"
> -// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../crtn.o"
> +// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2{{/|\\\\}}crtend.o"
> +// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../..{{/|\\\\}}crtn.o"
> //
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> // RUN: --target=arm-unknown-linux-gnueabi \
> // RUN: --sysroot=%S/Inputs/ubuntu_12.04_LTS_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-UBUNTU-12-04-ARM %s
> // CHECK-UBUNTU-12-04-ARM: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi/crt1.o"
> -// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi/crti.o"
> -// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/crtbegin.o"
> +// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crt1.o"
> +// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crti.o"
> +// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1{{/|\\\\}}crtbegin.o"
> // CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1"
> // CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi"
> // CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/lib/arm-linux-gnueabi"
> // CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/arm-linux-gnueabi"
> // CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../.."
> -// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/crtend.o"
> -// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi/crtn.o"
> +// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1{{/|\\\\}}crtend.o"
> +// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crtn.o"
> //
> // Test the setup that shipped in SUSE 10.3 on ppc64.
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -283,7 +283,7 @@
> // RUN: --sysroot=%S/Inputs/suse_10.3_ppc64_tree \
> // RUN: | FileCheck --check-prefix=CHECK-SUSE-10-3-PPC64 %s
> // CHECK-SUSE-10-3-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-SUSE-10-3-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64/crtbegin.o"
> +// CHECK-SUSE-10-3-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64{{/|\\\\}}crtbegin.o"
> // CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64"
> // CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/4.1.2/../../../../lib64"
> // CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/lib/../lib64"
> @@ -356,7 +356,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-X86 %s
> // CHECK-DEBIAN-X86: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-X86: "{{.*}}/usr/lib/gcc/i686-linux-gnu/4.5/crtbegin.o"
> +// CHECK-DEBIAN-X86: "{{.*}}/usr/lib/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5"
> // CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../i386-linux-gnu"
> // CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu"
> @@ -368,7 +368,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-X86-64 %s
> // CHECK-DEBIAN-X86-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-X86-64: "{{.*}}/usr/lib/gcc/x86_64-linux-gnu/4.5/crtbegin.o"
> +// CHECK-DEBIAN-X86-64: "{{.*}}/usr/lib/gcc/x86_64-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5"
> // CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../x86_64-linux-gnu"
> // CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/x86_64-linux-gnu"
> @@ -380,7 +380,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-PPC %s
> // CHECK-DEBIAN-PPC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-PPC: "{{.*}}/usr/lib/gcc/powerpc-linux-gnu/4.5/crtbegin.o"
> +// CHECK-DEBIAN-PPC: "{{.*}}/usr/lib/gcc/powerpc-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5"
> // CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../powerpc-linux-gnu"
> // CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/powerpc-linux-gnu"
> @@ -392,7 +392,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-PPC64 %s
> // CHECK-DEBIAN-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-linux-gnu/4.5/crtbegin.o"
> +// CHECK-DEBIAN-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5"
> // CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../powerpc64-linux-gnu"
> // CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/powerpc64-linux-gnu"
> @@ -404,7 +404,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS %s
> // CHECK-DEBIAN-MIPS: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-MIPS: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/crtbegin.o"
> +// CHECK-DEBIAN-MIPS: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5"
> // CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../../mips-linux-gnu"
> // CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/mips-linux-gnu"
> @@ -416,7 +416,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPSEL %s
> // CHECK-DEBIAN-MIPSEL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/crtbegin.o"
> +// CHECK-DEBIAN-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5"
> // CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../../mipsel-linux-gnu"
> // CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/mipsel-linux-gnu"
> @@ -428,7 +428,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64 %s
> // CHECK-DEBIAN-MIPS64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-MIPS64: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/64/crtbegin.o"
> +// CHECK-DEBIAN-MIPS64: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/64{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/64"
> // CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5"
> // CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../.."
> @@ -439,7 +439,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64EL %s
> // CHECK-DEBIAN-MIPS64EL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/64/crtbegin.o"
> +// CHECK-DEBIAN-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/64{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/64"
> // CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5"
> // CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../.."
> @@ -450,7 +450,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64-N32 %s
> // CHECK-DEBIAN-MIPS64-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-MIPS64-N32: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/n32/crtbegin.o"
> +// CHECK-DEBIAN-MIPS64-N32: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/n32{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/n32"
> // CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5"
> // CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../.."
> @@ -461,7 +461,7 @@
> // RUN: --sysroot=%S/Inputs/debian_multiarch_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64EL-N32 %s
> // CHECK-DEBIAN-MIPS64EL-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/n32/crtbegin.o"
> +// CHECK-DEBIAN-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/n32{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/n32"
> // CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5"
> // CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../.."
> @@ -486,13 +486,13 @@
> // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
> // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
> // CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-ANDROID: "{{.*}}/crtbegin_dynamic.o"
> +// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o"
> // CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib"
> // CHECK-ANDROID-NOT: "gcc_s"
> // CHECK-ANDROID: "-lgcc"
> // CHECK-ANDROID: "-ldl"
> // CHECK-ANDROID-NOT: "gcc_s"
> -// CHECK-ANDROID: "{{.*}}/crtend_android.o"
> +// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtend_android.o"
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> // RUN: --target=arm-linux-androideabi \
> // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
> @@ -515,13 +515,13 @@
> // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
> // CHECK-ANDROID-SO: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> // CHECK-ANDROID-SO: "-Bsymbolic"
> -// CHECK-ANDROID-SO: "{{.*}}/crtbegin_so.o"
> +// CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtbegin_so.o"
> // CHECK-ANDROID-SO: "-L[[SYSROOT]]/usr/lib"
> // CHECK-ANDROID-SO-NOT: "gcc_s"
> // CHECK-ANDROID-SO: "-lgcc"
> // CHECK-ANDROID-SO: "-ldl"
> // CHECK-ANDROID-SO-NOT: "gcc_s"
> -// CHECK-ANDROID-SO: "{{.*}}/crtend_so.o"
> +// CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtend_so.o"
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> // RUN: --target=arm-linux-androideabi \
> // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
> @@ -543,13 +543,13 @@
> // RUN: -static \
> // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
> // CHECK-ANDROID-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-ANDROID-STATIC: "{{.*}}/crtbegin_static.o"
> +// CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtbegin_static.o"
> // CHECK-ANDROID-STATIC: "-L[[SYSROOT]]/usr/lib"
> // CHECK-ANDROID-STATIC-NOT: "gcc_s"
> // CHECK-ANDROID-STATIC: "-lgcc"
> // CHECK-ANDROID-STATIC-NOT: "-ldl"
> // CHECK-ANDROID-STATIC-NOT: "gcc_s"
> -// CHECK-ANDROID-STATIC: "{{.*}}/crtend_android.o"
> +// CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtend_android.o"
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> // RUN: --target=arm-linux-androideabi \
> // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
> @@ -571,12 +571,12 @@
> // RUN: -pie \
> // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
> // CHECK-ANDROID-PIE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-ANDROID-PIE: "{{.*}}/crtbegin_dynamic.o"
> +// CHECK-ANDROID-PIE: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o"
> // CHECK-ANDROID-PIE: "-L[[SYSROOT]]/usr/lib"
> // CHECK-ANDROID-PIE-NOT: "gcc_s"
> // CHECK-ANDROID-PIE: "-lgcc"
> // CHECK-ANDROID-PIE-NOT: "gcc_s"
> -// CHECK-ANDROID-PIE: "{{.*}}/crtend_android.o"
> +// CHECK-ANDROID-PIE: "{{.*}}{{/|\\\\}}crtend_android.o"
> //
> // Check linker invocation on Debian 6 MIPS 32/64-bit.
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -584,9 +584,9 @@
> // RUN: --sysroot=%S/Inputs/debian_6_mips_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPSEL %s
> // CHECK-DEBIAN-ML-MIPSEL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib/crt1.o"
> -// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib/crti.o"
> -// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/crtbegin.o"
> +// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib{{/|\\\\}}crt1.o"
> +// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib{{/|\\\\}}crti.o"
> +// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4"
> // CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib"
> // CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/lib/../lib"
> @@ -600,9 +600,9 @@
> // RUN: --sysroot=%S/Inputs/debian_6_mips_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPS64EL %s
> // CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64/crt1.o"
> -// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64/crti.o"
> -// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/64/crtbegin.o"
> +// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64{{/|\\\\}}crt1.o"
> +// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64{{/|\\\\}}crti.o"
> +// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/64{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/64"
> // CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64"
> // CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/lib/../lib64"
> @@ -616,9 +616,9 @@
> // RUN: --sysroot=%S/Inputs/debian_6_mips_tree \
> // RUN: | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPS64EL-N32 %s
> // CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> -// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32/crt1.o"
> -// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32/crti.o"
> -// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/n32/crtbegin.o"
> +// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32{{/|\\\\}}crt1.o"
> +// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32{{/|\\\\}}crti.o"
> +// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/n32{{/|\\\\}}crtbegin.o"
> // CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/n32"
> // CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32"
> // CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/lib/../lib32"
> @@ -634,8 +634,8 @@
> // RUN: | FileCheck --check-prefix=CHECK-FSL-PPC %s
> // CHECK-FSL-PPC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> // CHECK-FSL-PPC: "-m" "elf32ppclinux"
> -// CHECK-FSL-PPC: "{{.*}}/crt1.o"
> -// CHECK-FSL-PPC: "{{.*}}/crtbegin.o"
> +// CHECK-FSL-PPC: "{{.*}}{{/|\\\\}}crt1.o"
> +// CHECK-FSL-PPC: "{{.*}}{{/|\\\\}}crtbegin.o"
> // CHECK-FSL-PPC: "-L[[SYSROOT]]/usr/lib"
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> // RUN: --target=powerpc64-fsl-linux \
> @@ -643,8 +643,8 @@
> // RUN: | FileCheck --check-prefix=CHECK-FSL-PPC64 %s
> // CHECK-FSL-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
> // CHECK-FSL-PPC64: "-m" "elf64ppc"
> -// CHECK-FSL-PPC64: "{{.*}}/crt1.o"
> -// CHECK-FSL-PPC64: "{{.*}}/crtbegin.o"
> +// CHECK-FSL-PPC64: "{{.*}}{{/|\\\\}}crt1.o"
> +// CHECK-FSL-PPC64: "{{.*}}{{/|\\\\}}crtbegin.o"
> // CHECK-FSL-PPC64: "-L[[SYSROOT]]/usr/lib64/powerpc64-fsl-linux/4.6.2/../.."
> //
> // Check that crtfastmath.o is linked with -ffast-math.
> @@ -665,7 +665,7 @@
> // RUN: %clang --target=i386-unknown-linux -### %s -ffast-math \
> // RUN: --sysroot=%S/Inputs/basic_linux_tree 2>&1 \
> // RUN: | FileCheck --check-prefix=CHECK-NOCRTFASTMATH %s
> -// CHECK-CRTFASTMATH: usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtfastmath.o
> +// CHECK-CRTFASTMATH: usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtfastmath.o
> // CHECK-NOCRTFASTMATH-NOT: crtfastmath.o
>
> // Check that we link in gcrt1.o when compiling with -pg
>
> Modified: cfe/trunk/test/Driver/mips-cs-ld.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mips-cs-ld.c?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/mips-cs-ld.c (original)
> +++ cfe/trunk/test/Driver/mips-cs-ld.c Mon Jun 24 17:07:15 2013
> @@ -7,15 +7,15 @@
> // RUN: | FileCheck --check-prefix=CHECK-BE-HF-32 %s
> // CHECK-BE-HF-32: "{{.*}}ld{{(.exe)?}}"
> // CHECK-BE-HF-32: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc"
> -// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib/crt1.o"
> -// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib/crti.o"
> -// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/crtbegin.o"
> +// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3{{/|\\\\}}crtbegin.o"
> // CHECK-BE-HF-32: "-L[[TC]]"
> // CHECK-BE-HF-32: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib"
> // CHECK-BE-HF-32: "-L[[TC]]/../../../../mips-linux-gnu/libc/lib"
> // CHECK-BE-HF-32: "-L[[TC]]/../../../../mips-linux-gnu/libc/usr/lib"
> -// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/crtend.o"
> -// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib/crtn.o"
> +// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3{{/|\\\\}}crtend.o"
> +// CHECK-BE-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Big-endian, hard float, mips16
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -24,16 +24,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-BE-HF-16 %s
> // CHECK-BE-HF-16: "{{.*}}ld{{(.exe)?}}"
> // CHECK-BE-HF-16: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/mips16"
> -// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/usr/lib/../lib/crt1.o"
> -// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/usr/lib/../lib/crti.o"
> -// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/crtbegin.o"
> +// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16{{/|\\\\}}crtbegin.o"
> // CHECK-BE-HF-16: "-L[[TC]]/mips16"
> // CHECK-BE-HF-16: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/mips16"
> // CHECK-BE-HF-16: "-L[[TC]]"
> // CHECK-BE-HF-16: "-L[[TC]]/../../../../mips-linux-gnu/libc/mips16/lib"
> // CHECK-BE-HF-16: "-L[[TC]]/../../../../mips-linux-gnu/libc/mips16/usr/lib"
> -// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/crtend.o"
> -// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/usr/lib/../lib/crtn.o"
> +// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16{{/|\\\\}}crtend.o"
> +// CHECK-BE-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Big-endian, hard float, mmicromips
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -42,16 +42,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-BE-HF-MICRO %s
> // CHECK-BE-HF-MICRO: "{{.*}}ld{{(.exe)?}}"
> // CHECK-BE-HF-MICRO: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/micromips"
> -// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/usr/lib/../lib/crt1.o"
> -// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/usr/lib/../lib/crti.o"
> -// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/crtbegin.o"
> +// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips{{/|\\\\}}crtbegin.o"
> // CHECK-BE-HF-MICRO: "-L[[TC]]/micromips"
> // CHECK-BE-HF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/micromips"
> // CHECK-BE-HF-MICRO: "-L[[TC]]"
> // CHECK-BE-HF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/libc/micromips/lib"
> // CHECK-BE-HF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/libc/micromips/usr/lib"
> -// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/crtend.o"
> -// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/usr/lib/../lib/crtn.o"
> +// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips{{/|\\\\}}crtend.o"
> +// CHECK-BE-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Big-endian, soft float
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -60,16 +60,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-BE-SF-32 %s
> // CHECK-BE-SF-32: "{{.*}}ld{{(.exe)?}}"
> // CHECK-BE-SF-32: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/soft-float"
> -// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib/crt1.o"
> -// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib/crti.o"
> -// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/crtbegin.o"
> +// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float{{/|\\\\}}crtbegin.o"
> // CHECK-BE-SF-32: "-L[[TC]]/soft-float"
> // CHECK-BE-SF-32: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/soft-float"
> // CHECK-BE-SF-32: "-L[[TC]]"
> // CHECK-BE-SF-32: "-L[[TC]]/../../../../mips-linux-gnu/libc/soft-float/lib"
> // CHECK-BE-SF-32: "-L[[TC]]/../../../../mips-linux-gnu/libc/soft-float/usr/lib"
> -// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/crtend.o"
> -// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib/crtn.o"
> +// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float{{/|\\\\}}crtend.o"
> +// CHECK-BE-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Big-endian, soft float, mips16
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -78,16 +78,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-BE-SF-16 %s
> // CHECK-BE-SF-16: "{{.*}}ld{{(.exe)?}}"
> // CHECK-BE-SF-16: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/mips16/soft-float"
> -// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib/../lib/crt1.o"
> -// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib/../lib/crti.o"
> -// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/crtbegin.o"
> +// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float{{/|\\\\}}crtbegin.o"
> // CHECK-BE-SF-16: "-L[[TC]]/mips16/soft-float"
> // CHECK-BE-SF-16: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/mips16/soft-float"
> // CHECK-BE-SF-16: "-L[[TC]]"
> // CHECK-BE-SF-16: "-L[[TC]]/../../../../mips-linux-gnu/libc/mips16/soft-float/lib"
> // CHECK-BE-SF-16: "-L[[TC]]/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib"
> -// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/crtend.o"
> -// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib/../lib/crtn.o"
> +// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float{{/|\\\\}}crtend.o"
> +// CHECK-BE-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Big-endian, soft float, micromips
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -96,16 +96,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-BE-SF-MICRO %s
> // CHECK-BE-SF-MICRO: "{{.*}}ld{{(.exe)?}}"
> // CHECK-BE-SF-MICRO: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/micromips/soft-float"
> -// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib/../lib/crt1.o"
> -// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib/../lib/crti.o"
> -// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/crtbegin.o"
> +// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float{{/|\\\\}}crtbegin.o"
> // CHECK-BE-SF-MICRO: "-L[[TC]]/micromips/soft-float"
> // CHECK-BE-SF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/micromips/soft-float"
> // CHECK-BE-SF-MICRO: "-L[[TC]]"
> // CHECK-BE-SF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/libc/micromips/soft-float/lib"
> // CHECK-BE-SF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib"
> -// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/crtend.o"
> -// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib/../lib/crtn.o"
> +// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float{{/|\\\\}}crtend.o"
> +// CHECK-BE-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Big-endian, hard float, 64-bit
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -114,16 +114,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-BE-HF-64 %s
> // CHECK-BE-HF-64: "{{.*}}ld{{(.exe)?}}"
> // CHECK-BE-HF-64: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc"
> -// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib64/crt1.o"
> -// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib64/crti.o"
> -// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/64/crtbegin.o"
> +// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib64{{/|\\\\}}crt1.o"
> +// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib64{{/|\\\\}}crti.o"
> +// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/64{{/|\\\\}}crtbegin.o"
> // CHECK-BE-HF-64: "-L[[TC]]/64"
> // CHECK-BE-HF-64: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib64"
> // CHECK-BE-HF-64: "-L[[TC]]/../../../../mips-linux-gnu/libc/lib/../lib64"
> // CHECK-BE-HF-64: "-L[[TC]]/../../../../mips-linux-gnu/libc/usr/lib/../lib64"
> // CHECK-BE-HF-64: "-L[[TC]]"
> -// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/64/crtend.o"
> -// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib64/crtn.o"
> +// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/64{{/|\\\\}}crtend.o"
> +// CHECK-BE-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/usr/lib/../lib64{{/|\\\\}}crtn.o"
> //
> // = Big-endian, soft float, 64-bit
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -132,16 +132,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-BE-SF-64 %s
> // CHECK-BE-SF-64: "{{.*}}ld{{(.exe)?}}"
> // CHECK-BE-SF-64: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/soft-float"
> -// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64/crt1.o"
> -// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64/crti.o"
> -// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/64/crtbegin.o"
> +// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64{{/|\\\\}}crt1.o"
> +// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64{{/|\\\\}}crti.o"
> +// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/64{{/|\\\\}}crtbegin.o"
> // CHECK-BE-SF-64: "-L[[TC]]/soft-float/64"
> // CHECK-BE-SF-64: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib64/soft-float"
> // CHECK-BE-SF-64: "-L[[TC]]/../../../../mips-linux-gnu/libc/soft-float/lib/../lib64"
> // CHECK-BE-SF-64: "-L[[TC]]/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64"
> // CHECK-BE-SF-64: "-L[[TC]]"
> -// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/64/crtend.o"
> -// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64/crtn.o"
> +// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/64{{/|\\\\}}crtend.o"
> +// CHECK-BE-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64{{/|\\\\}}crtn.o"
> //
> // = Little-endian, hard float
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -150,16 +150,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-EL-HF-32 %s
> // CHECK-EL-HF-32: "{{.*}}ld{{(.exe)?}}"
> // CHECK-EL-HF-32: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/el"
> -// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/el/crtbegin.o"
> +// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/el{{/|\\\\}}crtbegin.o"
> // CHECK-EL-HF-32: "-L[[TC]]/el"
> // CHECK-EL-HF-32: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/el"
> // CHECK-EL-HF-32: "-L[[TC]]"
> // CHECK-EL-HF-32: "-L[[TC]]/../../../../mips-linux-gnu/libc/el/lib"
> // CHECK-EL-HF-32: "-L[[TC]]/../../../../mips-linux-gnu/libc/el/usr/lib"
> -// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/el/crtend.o"
> -// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib/crtn.o"
> +// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/el{{/|\\\\}}crtend.o"
> +// CHECK-EL-HF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Little-endian, hard float, mips16
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -168,16 +168,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-EL-HF-16 %s
> // CHECK-EL-HF-16: "{{.*}}ld{{(.exe)?}}"
> // CHECK-EL-HF-16: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/mips16/el"
> -// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/el/crtbegin.o"
> +// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/el/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/el/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/el{{/|\\\\}}crtbegin.o"
> // CHECK-EL-HF-16: "-L[[TC]]/mips16/el"
> // CHECK-EL-HF-16: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/mips16/el"
> // CHECK-EL-HF-16: "-L[[TC]]"
> // CHECK-EL-HF-16: "-L[[TC]]/../../../../mips-linux-gnu/libc/mips16/el/lib"
> // CHECK-EL-HF-16: "-L[[TC]]/../../../../mips-linux-gnu/libc/mips16/el/usr/lib"
> -// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/el/crtend.o"
> -// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/el/usr/lib/../lib/crtn.o"
> +// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/el{{/|\\\\}}crtend.o"
> +// CHECK-EL-HF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/el/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Little-endian, hard float, micromips
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -186,16 +186,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-EL-HF-MICRO %s
> // CHECK-EL-HF-MICRO: "{{.*}}ld{{(.exe)?}}"
> // CHECK-EL-HF-MICRO: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/micromips/el"
> -// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/el/crtbegin.o"
> +// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/el/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/el/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/el{{/|\\\\}}crtbegin.o"
> // CHECK-EL-HF-MICRO: "-L[[TC]]/micromips/el"
> // CHECK-EL-HF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/micromips/el"
> // CHECK-EL-HF-MICRO: "-L[[TC]]"
> // CHECK-EL-HF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/libc/micromips/el/lib"
> // CHECK-EL-HF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/libc/micromips/el/usr/lib"
> -// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/el/crtend.o"
> -// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/el/usr/lib/../lib/crtn.o"
> +// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/el{{/|\\\\}}crtend.o"
> +// CHECK-EL-HF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/el/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Little-endian, soft float
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -204,16 +204,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-EL-SF-32 %s
> // CHECK-EL-SF-32: "{{.*}}ld{{(.exe)?}}"
> // CHECK-EL-SF-32: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/soft-float/el"
> -// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/crtbegin.o"
> +// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el{{/|\\\\}}crtbegin.o"
> // CHECK-EL-SF-32: "-L[[TC]]/soft-float/el"
> // CHECK-EL-SF-32: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/soft-float/el"
> // CHECK-EL-SF-32: "-L[[TC]]"
> // CHECK-EL-SF-32: "-L[[TC]]/../../../../mips-linux-gnu/libc/soft-float/el/lib"
> // CHECK-EL-SF-32: "-L[[TC]]/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib"
> -// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/crtend.o"
> -// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib/crtn.o"
> +// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el{{/|\\\\}}crtend.o"
> +// CHECK-EL-SF-32: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Little-endian, soft float, mips16
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -222,16 +222,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-EL-SF-16 %s
> // CHECK-EL-SF-16: "{{.*}}ld{{(.exe)?}}"
> // CHECK-EL-SF-16: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/mips16/soft-float/el"
> -// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/el/crtbegin.o"
> +// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/el{{/|\\\\}}crtbegin.o"
> // CHECK-EL-SF-16: "-L[[TC]]/mips16/soft-float/el"
> // CHECK-EL-SF-16: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/mips16/soft-float/el"
> // CHECK-EL-SF-16: "-L[[TC]]"
> // CHECK-EL-SF-16: "-L[[TC]]/../../../../mips-linux-gnu/libc/mips16/soft-float/el/lib"
> // CHECK-EL-SF-16: "-L[[TC]]/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib"
> -// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/el/crtend.o"
> -// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/../lib/crtn.o"
> +// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/el{{/|\\\\}}crtend.o"
> +// CHECK-EL-SF-16: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Little-endian, soft float, micromips
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -240,16 +240,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-EL-SF-MICRO %s
> // CHECK-EL-SF-MICRO: "{{.*}}ld{{(.exe)?}}"
> // CHECK-EL-SF-MICRO: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/micromips/soft-float/el"
> -// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/el/crtbegin.o"
> +// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/../lib{{/|\\\\}}crt1.o"
> +// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/../lib{{/|\\\\}}crti.o"
> +// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/el{{/|\\\\}}crtbegin.o"
> // CHECK-EL-SF-MICRO: "-L[[TC]]/micromips/soft-float/el"
> // CHECK-EL-SF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib/micromips/soft-float/el"
> // CHECK-EL-SF-MICRO: "-L[[TC]]"
> // CHECK-EL-SF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/libc/micromips/soft-float/el/lib"
> // CHECK-EL-SF-MICRO: "-L[[TC]]/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib"
> -// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/el/crtend.o"
> -// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/../lib/crtn.o"
> +// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/el{{/|\\\\}}crtend.o"
> +// CHECK-EL-SF-MICRO: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/../lib{{/|\\\\}}crtn.o"
> //
> // = Little-endian, hard float, 64-bit
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -258,16 +258,16 @@
> // RUN: | FileCheck --check-prefix=CHECK-EL-HF-64 %s
> // CHECK-EL-HF-64: "{{.*}}ld{{(.exe)?}}"
> // CHECK-EL-HF-64: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/el"
> -// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64/crt1.o"
> -// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64/crti.o"
> -// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/el/64/crtbegin.o"
> +// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64{{/|\\\\}}crt1.o"
> +// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64{{/|\\\\}}crti.o"
> +// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/el/64{{/|\\\\}}crtbegin.o"
> // CHECK-EL-HF-64: "-L[[TC]]/el/64"
> // CHECK-EL-HF-64: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib64/el"
> // CHECK-EL-HF-64: "-L[[TC]]/../../../../mips-linux-gnu/libc/el/lib/../lib64"
> // CHECK-EL-HF-64: "-L[[TC]]/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64"
> // CHECK-EL-HF-64: "-L[[TC]]"
> -// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/el/64/crtend.o"
> -// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64/crtn.o"
> +// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/el/64{{/|\\\\}}crtend.o"
> +// CHECK-EL-HF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64{{/|\\\\}}crtn.o"
> //
> // = Little-endian, soft float, 64-bit
> // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -276,13 +276,13 @@
> // RUN: | FileCheck --check-prefix=CHECK-EL-SF-64 %s
> // CHECK-EL-SF-64: "{{.*}}ld{{(.exe)?}}"
> // CHECK-EL-SF-64: "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc/soft-float/el"
> -// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64/crt1.o"
> -// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64/crti.o"
> -// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/64/crtbegin.o"
> +// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64{{/|\\\\}}crt1.o"
> +// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64{{/|\\\\}}crti.o"
> +// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/64{{/|\\\\}}crtbegin.o"
> // CHECK-EL-SF-64: "-L[[TC]]/soft-float/el/64"
> // CHECK-EL-SF-64: "-L[[TC]]/../../../../mips-linux-gnu/lib/../lib64/soft-float/el"
> // CHECK-EL-SF-64: "-L[[TC]]/../../../../mips-linux-gnu/libc/soft-float/el/lib/../lib64"
> // CHECK-EL-SF-64: "-L[[TC]]/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64"
> // CHECK-EL-SF-64: "-L[[TC]]"
> -// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/64/crtend.o"
> -// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64/crtn.o"
> +// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/64{{/|\\\\}}crtend.o"
> +// CHECK-EL-SF-64: "{{.*}}/lib/gcc/mips-linux-gnu/4.6.3/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64{{/|\\\\}}crtn.o"
>
> Modified: cfe/trunk/test/Driver/montavista-gcc-toolchain.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/montavista-gcc-toolchain.c?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/montavista-gcc-toolchain.c (original)
> +++ cfe/trunk/test/Driver/montavista-gcc-toolchain.c Mon Jun 24 17:07:15 2013
> @@ -6,4 +6,4 @@
> // RUN: | FileCheck %s
>
> // Test for header search toolchain detection.
> -// CHECK: montavista_i686_tree/usr/lib/gcc/i686-montavista-linux/4.2.0/libgcc.a
> +// CHECK: montavista_i686_tree/usr/lib/gcc/i686-montavista-linux/4.2.0{{/|\\}}libgcc.a
>
> Modified: cfe/trunk/test/Preprocessor/iwithprefix.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/iwithprefix.c?rev=184790&r1=184789&r2=184790&view=diff
> ==============================================================================
> --- cfe/trunk/test/Preprocessor/iwithprefix.c (original)
> +++ cfe/trunk/test/Preprocessor/iwithprefix.c Mon Jun 24 17:07:15 2013
> @@ -10,7 +10,7 @@
>
> // CHECK: #include <...> search starts here:
> // CHECK: {{.*}}.tmps/first
> -// CHECK: /lib/clang/{{[.0-9]+}}/include
> +// CHECK: {{/|\\}}lib{{/|\\}}clang{{/|\\}}{{[.0-9]+}}{{/|\\}}include
> // CHECK: {{.*}}.tmps/second
> // CHECK-NOT: {{.*}}.tmps
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130624/9e71efc9/attachment.html>
More information about the cfe-commits
mailing list