r192676 - clang/test/Driver/netbsd.c*: Tweak path separators to be matched on win32 driver.

NAKAMURA Takumi geek4civic at gmail.com
Mon Oct 14 23:36:47 PDT 2013


Author: chapuni
Date: Tue Oct 15 01:36:47 2013
New Revision: 192676

URL: http://llvm.org/viewvc/llvm-project?rev=192676&view=rev
Log:
clang/test/Driver/netbsd.c*: Tweak path separators to be matched on win32 driver.

Modified:
    cfe/trunk/test/Driver/netbsd.c
    cfe/trunk/test/Driver/netbsd.cpp

Modified: cfe/trunk/test/Driver/netbsd.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/netbsd.c?rev=192676&r1=192675&r2=192676&view=diff
==============================================================================
--- cfe/trunk/test/Driver/netbsd.c (original)
+++ cfe/trunk/test/Driver/netbsd.c Tue Oct 15 01:36:47 2013
@@ -20,38 +20,38 @@
 
 // X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
 // X86_64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// X86_64: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
-// X86_64: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// X86_64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
+// X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
 // X86_64-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64-7: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// X86_64-7:  "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
-// X86_64-7: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// X86_64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// X86_64-7:  "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
+// X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
 // X86_64-6: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64-6: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// X86_64-6: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
+// X86_64-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
 // X86_64-6: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
-// X86_64-6: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // S-X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
 // S-X86_64: ld{{.*}}" "-Bstatic"
-// S-X86_64: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// S-X86_64: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
-// S-X86_64: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// S-X86_64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// S-X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
+// S-X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // S-X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
 // S-X86_64-7: ld{{.*}}" "-Bstatic"
-// S-X86_64-7: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// S-X86_64-7: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
-// S-X86_64-7: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// S-X86_64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// S-X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
+// S-X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // S-X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
 // S-X86_64-6: ld{{.*}}" "-Bstatic"
-// S-X86_64-6: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// S-X86_64-6: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
+// S-X86_64-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// S-X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
 // S-X86_64-6: "-lgcc_eh" "-lc" "-lgcc"
-// S-X86_64-6: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// S-X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"

Modified: cfe/trunk/test/Driver/netbsd.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/netbsd.cpp?rev=192676&r1=192675&r2=192676&view=diff
==============================================================================
--- cfe/trunk/test/Driver/netbsd.cpp (original)
+++ cfe/trunk/test/Driver/netbsd.cpp Tue Oct 15 01:36:47 2013
@@ -20,38 +20,38 @@
 
 // X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
 // X86_64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// X86_64: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc++"
-// X86_64: "-lm" "-lc" "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// X86_64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++"
+// X86_64: "-lm" "-lc" "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
 // X86_64-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64-7: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// X86_64-7: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc++"
-// X86_64-7: "-lm" "-lc" "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// X86_64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++"
+// X86_64-7: "-lm" "-lc" "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
 // X86_64-6: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64-6: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// X86_64-6: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lstdc++"
+// X86_64-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lstdc++"
 // X86_64-6: "-lm" "-lc" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
-// X86_64-6: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // S-X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
 // S-X86_64: ld{{.*}}" "-Bstatic"
-// S-X86_64: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// S-X86_64: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc++"
-// S-X86_64: "-lm" "-lc" "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// S-X86_64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// S-X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++"
+// S-X86_64: "-lm" "-lc" "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // S-X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
 // S-X86_64-7: ld{{.*}}" "-Bstatic"
-// S-X86_64-7: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// S-X86_64-7: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc++"
-// S-X86_64-7: "-lm" "-lc" "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// S-X86_64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// S-X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++"
+// S-X86_64-7: "-lm" "-lc" "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // S-X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
 // S-X86_64-6: ld{{.*}}" "-Bstatic"
-// S-X86_64-6: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
-// S-X86_64-6: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lstdc++"
+// S-X86_64-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
+// S-X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lstdc++"
 // S-X86_64-6: "-lm" "-lc" "-lgcc_eh" "-lc" "-lgcc"
-// S-X86_64-6: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
+// S-X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"





More information about the cfe-commits mailing list