r180786 - Use {{.*}}suffix instead of [[TC]] in places where we print the toolchain
Rafael EspĂndola
rafael.espindola at gmail.com
Tue Apr 30 10:58:48 PDT 2013
Strange, that is not the line that was failing before. The test also
passes on the bot I was looking at:
old:
http://bb.pgr.jp/builders/cmake-clang-x64-msc16-R/builds/640
new:
http://bb.pgr.jp/builders/cmake-clang-x64-msc16-R/builds/641
So there is probably something different is the setup your bot is
using. Does linux-ld.c passes for you?
2013/4/30 jahanian <fjahanian at apple.com>:
> Hi Rafael,
> Thanks for working on this. This test still fails on clang built on
> Windows/VS.
> With this symptom:
>
> C:\public\zorg\buildbot\smooshlab\slave-0.8\build.modernrewriter_x86_64-pc-win64_Firehawk\src\tools\clang\test\Driver\mips-cs-ld.c:9:20:
> error: expected string not found in input
> // CHECK-BE-HF-32:
> "--sysroot=[[TC:[^"]+]]/../../../../mips-linux-gnu/libc"
>
> Is this test even relevant to Windows/VS. Can we just // XFAIL: win32 it?
>
> - Fariborz
>
> On Apr 30, 2013, at 6:08 AM, Rafael Espindola <rafael.espindola at gmail.com>
> wrote:
>
> Author: rafael
> Date: Tue Apr 30 08:08:15 2013
> New Revision: 180786
>
> URL: http://llvm.org/viewvc/llvm-project?rev=180786&view=rev
> Log:
> Use {{.*}}suffix instead of [[TC]] in places where we print the toolchain
> path with /. This matches linux-ld.c and should finish fixing this test on
> windows.
>
> Modified:
> cfe/trunk/test/Driver/mips-cs-ld.c
>
> 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=180786&r1=180785&r2=180786&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/mips-cs-ld.c (original)
> +++ cfe/trunk/test/Driver/mips-cs-ld.c Tue Apr 30 08:08: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:
> "[[TC]]/../../../../mips-linux-gnu/libc/usr/lib/../lib/crt1.o"
> -// CHECK-BE-HF-32:
> "[[TC]]/../../../../mips-linux-gnu/libc/usr/lib/../lib/crti.o"
> -// CHECK-BE-HF-32: "[[TC]]/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: "[[TC]]/crtend.o"
> -// CHECK-BE-HF-32:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/mips16/usr/lib/../lib/crt1.o"
> -// CHECK-BE-HF-16:
> "[[TC]]/../../../../mips-linux-gnu/libc/mips16/usr/lib/../lib/crti.o"
> -// CHECK-BE-HF-16: "[[TC]]/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: "[[TC]]/mips16/crtend.o"
> -// CHECK-BE-HF-16:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/micromips/usr/lib/../lib/crt1.o"
> -// CHECK-BE-HF-MICRO:
> "[[TC]]/../../../../mips-linux-gnu/libc/micromips/usr/lib/../lib/crti.o"
> -// CHECK-BE-HF-MICRO: "[[TC]]/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: "[[TC]]/micromips/crtend.o"
> -// CHECK-BE-HF-MICRO:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib/crt1.o"
> -// CHECK-BE-SF-32:
> "[[TC]]/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib/crti.o"
> -// CHECK-BE-SF-32: "[[TC]]/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: "[[TC]]/soft-float/crtend.o"
> -// CHECK-BE-SF-32:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib/../lib/crt1.o"
> -// CHECK-BE-SF-16:
> "[[TC]]/../../../../mips-linux-gnu/libc/mips16/soft-float/usr/lib/../lib/crti.o"
> -// CHECK-BE-SF-16: "[[TC]]/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: "[[TC]]/mips16/soft-float/crtend.o"
> -// CHECK-BE-SF-16:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib/../lib/crt1.o"
> -// CHECK-BE-SF-MICRO:
> "[[TC]]/../../../../mips-linux-gnu/libc/micromips/soft-float/usr/lib/../lib/crti.o"
> -// CHECK-BE-SF-MICRO: "[[TC]]/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: "[[TC]]/micromips/soft-float/crtend.o"
> -// CHECK-BE-SF-MICRO:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/usr/lib/../lib64/crt1.o"
> -// CHECK-BE-HF-64:
> "[[TC]]/../../../../mips-linux-gnu/libc/usr/lib/../lib64/crti.o"
> -// CHECK-BE-HF-64: "[[TC]]/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: "[[TC]]/64/crtend.o"
> -// CHECK-BE-HF-64:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64/crt1.o"
> -// CHECK-BE-SF-64:
> "[[TC]]/../../../../mips-linux-gnu/libc/soft-float/usr/lib/../lib64/crti.o"
> -// CHECK-BE-SF-64: "[[TC]]/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: "[[TC]]/soft-float/64/crtend.o"
> -// CHECK-BE-SF-64:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-HF-32:
> "[[TC]]/../../../../mips-linux-gnu/libc/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-HF-32: "[[TC]]/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: "[[TC]]/el/crtend.o"
> -// CHECK-EL-HF-32:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/mips16/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-HF-16:
> "[[TC]]/../../../../mips-linux-gnu/libc/mips16/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-HF-16: "[[TC]]/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: "[[TC]]/mips16/el/crtend.o"
> -// CHECK-EL-HF-16:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/micromips/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-HF-MICRO:
> "[[TC]]/../../../../mips-linux-gnu/libc/micromips/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-HF-MICRO: "[[TC]]/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: "[[TC]]/micromips/el/crtend.o"
> -// CHECK-EL-HF-MICRO:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-SF-32:
> "[[TC]]/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-SF-32: "[[TC]]/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: "[[TC]]/soft-float/el/crtend.o"
> -// CHECK-EL-SF-32:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-SF-16:
> "[[TC]]/../../../../mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-SF-16: "[[TC]]/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: "[[TC]]/mips16/soft-float/el/crtend.o"
> -// CHECK-EL-SF-16:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/../lib/crt1.o"
> -// CHECK-EL-SF-MICRO:
> "[[TC]]/../../../../mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/../lib/crti.o"
> -// CHECK-EL-SF-MICRO: "[[TC]]/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: "[[TC]]/micromips/soft-float/el/crtend.o"
> -// CHECK-EL-SF-MICRO:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64/crt1.o"
> -// CHECK-EL-HF-64:
> "[[TC]]/../../../../mips-linux-gnu/libc/el/usr/lib/../lib64/crti.o"
> -// CHECK-EL-HF-64: "[[TC]]/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: "[[TC]]/el/64/crtend.o"
> -// CHECK-EL-HF-64:
> "[[TC]]/../../../../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:
> "[[TC]]/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64/crt1.o"
> -// CHECK-EL-SF-64:
> "[[TC]]/../../../../mips-linux-gnu/libc/soft-float/el/usr/lib/../lib64/crti.o"
> -// CHECK-EL-SF-64: "[[TC]]/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: "[[TC]]/soft-float/el/64/crtend.o"
> -// CHECK-EL-SF-64:
> "[[TC]]/../../../../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"
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
>
More information about the cfe-commits
mailing list