Skip to content

Commit 332d520

Browse files
MaskRayMaskRay
committed
[Driver][test] Remove unneeded -no-canonical-prefixes and -o %t.o
Similar to 9806799
1 parent fc1c160 commit 332d520

24 files changed

+638
-645
lines changed

‎clang/test/Driver/android-ndk-standalone.cpp

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Test header and library paths when Clang is used with Android standalone
22
// toolchain.
33
//
4-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
5-
// RUN: -target arm-linux-androideabi21 \
4+
// RUN: %clang -### %s 2>&1 \
5+
// RUN: --target=arm-linux-androideabi21 \
66
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
77
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
88
// RUN: | FileCheck %s
9-
// CHECK: {{.*}}clang{{.*}}" "-cc1"
9+
// CHECK: "-cc1"
1010
// CHECK: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
1111
// CHECK: "-internal-isystem" "{{.*}}/include/c++/v1"
1212
// CHECK: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
@@ -32,20 +32,20 @@
3232
// CHECK-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ ]*}}/lib/armv7-a"
3333
// CHECK-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ ]*}}/lib/thumb"
3434
//
35-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
36-
// RUN: -target arm-linux-androideabi14 \
35+
// RUN: %clang -### %s 2>&1 \
36+
// RUN: --target=arm-linux-androideabi14 \
3737
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
3838
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
3939
// RUN: | FileCheck --check-prefix=CHECK-14 %s
4040
// CHECK-14: "-L{{.*}}/sysroot/usr/lib/arm-linux-androideabi/14"
4141
// CHECK-14: "-L{{.*}}/sysroot/usr/lib/arm-linux-androideabi"
4242
//
43-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
44-
// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \
43+
// RUN: %clang -### %s 2>&1 \
44+
// RUN: --target=arm-linux-androideabi21 -stdlib=libstdc++ \
4545
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
4646
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
4747
// RUN: | FileCheck --check-prefix=CHECK-STDCXX %s
48-
// CHECK-STDCXX: {{.*}}clang{{.*}}" "-cc1"
48+
// CHECK-STDCXX: "-cc1"
4949
// CHECK-STDCXX: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
5050
// CHECK-STDCXX: "-internal-isystem" "{{.*}}/include/c++/4.9"
5151
// CHECK-STDCXX-NOT: "-internal-isystem" "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a/thumb"
@@ -74,12 +74,12 @@
7474
// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ ]*}}/lib/armv7-a"
7575
// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ ]*}}/lib/thumb"
7676
//
77-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
78-
// RUN: -target armv7a-none-linux-androideabi21 \
77+
// RUN: %clang -### %s 2>&1 \
78+
// RUN: --target=armv7a-none-linux-androideabi21 \
7979
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
8080
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
8181
// RUN: | FileCheck --check-prefix=CHECK-ARMV7 %s
82-
// CHECK-ARMV7: {{.*}}clang{{.*}}" "-cc1"
82+
// CHECK-ARMV7: "-cc1"
8383
// CHECK-ARMV7: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
8484
// CHECK-ARMV7: "-internal-isystem" "{{.*}}/include/c++/v1"
8585
// CHECK-ARMV7: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
@@ -106,33 +106,33 @@
106106
// CHECK-ARMV7-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ ]*}}/lib"
107107
//
108108
// Other flags that can trigger armv7 mode.
109-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
110-
// RUN: -target arm-linux-androideabi21 \
109+
// RUN: %clang -### %s 2>&1 \
110+
// RUN: --target=arm-linux-androideabi21 \
111111
// RUN: -march=armv7 \
112112
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
113113
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
114114
// RUN: | FileCheck --check-prefix=CHECK-ARMV7 %s
115-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
116-
// RUN: -target arm-linux-androideabi21 \
115+
// RUN: %clang -### %s 2>&1 \
116+
// RUN: --target=arm-linux-androideabi21 \
117117
// RUN: -march=armv7a \
118118
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
119119
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
120120
// RUN: | FileCheck --check-prefix=CHECK-ARMV7 %s
121-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
122-
// RUN: -target arm-linux-androideabi21 \
121+
// RUN: %clang -### %s 2>&1 \
122+
// RUN: --target=arm-linux-androideabi21 \
123123
// RUN: -march=armv7-a \
124124
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
125125
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
126126
// RUN: | FileCheck --check-prefix=CHECK-ARMV7 %s
127127
//
128128
// ARM thumb mode.
129-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
130-
// RUN: -target arm-linux-androideabi21 \
129+
// RUN: %clang -### %s 2>&1 \
130+
// RUN: --target=arm-linux-androideabi21 \
131131
// RUN: -mthumb \
132132
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
133133
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
134134
// RUN: | FileCheck --check-prefix=CHECK-THUMB %s
135-
// CHECK-THUMB: {{.*}}clang{{.*}}" "-cc1"
135+
// CHECK-THUMB: "-cc1"
136136
// CHECK-THUMB: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
137137
// CHECK-THUMB: "-internal-isystem" "{{.*}}/include/c++/v1"
138138
// CHECK-THUMB: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
@@ -160,13 +160,13 @@
160160
// CHECK-THUMB: "-L{{.*}}/sysroot/usr/lib"
161161
//
162162
// ARM V7 thumb mode.
163-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
164-
// RUN: -target arm-linux-androideabi21 \
163+
// RUN: %clang -### %s 2>&1 \
164+
// RUN: --target=arm-linux-androideabi21 \
165165
// RUN: -march=armv7-a -mthumb \
166166
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
167167
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
168168
// RUN: | FileCheck --check-prefix=CHECK-ARMV7THUMB %s
169-
// CHECK-ARMV7THUMB: {{.*}}clang{{.*}}" "-cc1"
169+
// CHECK-ARMV7THUMB: "-cc1"
170170
// CHECK-ARMV7THUMB: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
171171
// CHECK-ARMV7THUMB: "-internal-isystem" "{{.*}}/include/c++/v1"
172172
// CHECK-ARMV7THUMB: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
@@ -192,8 +192,8 @@
192192
// CHECK-ARMV7THUMB-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ ]*}}/lib/armv7-a"
193193
// CHECK-ARMV7THUMB-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ ]*}}/lib"
194194

195-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
196-
// RUN: -target arm-linux-androideabi21 \
195+
// RUN: %clang -### %s 2>&1 \
196+
// RUN: --target=arm-linux-androideabi21 \
197197
// RUN: -march=armv7-a -mthumb \
198198
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
199199
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
@@ -206,19 +206,19 @@
206206
// CHECK-ARM-MULTILIBS-NEXT: .;
207207

208208
//
209-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
210-
// RUN: -target armv7a-none-linux-androideabi21 \
209+
// RUN: %clang -### %s 2>&1 \
210+
// RUN: --target=armv7a-none-linux-androideabi21 \
211211
// RUN: -mthumb \
212212
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
213213
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
214214
// RUN: | FileCheck --check-prefix=CHECK-ARMV7THUMB %s
215215
//
216-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
217-
// RUN: -target aarch64-linux-android21 \
216+
// RUN: %clang -### %s 2>&1 \
217+
// RUN: --target=aarch64-linux-android21 \
218218
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
219219
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
220220
// RUN: | FileCheck --check-prefix=CHECK-AARCH64 %s
221-
// CHECK-AARCH64: {{.*}}clang{{.*}}" "-cc1"
221+
// CHECK-AARCH64: "-cc1"
222222
// CHECK-AARCH64: "-internal-isystem" "{{.*}}/include/c++/v1"
223223
// CHECK-AARCH64: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include/aarch64-linux-android"
224224
// CHECK-AARCH64: "-internal-externc-isystem" "{{.*}}/sysroot/include"
@@ -229,12 +229,12 @@
229229
// CHECK-AARCH64: "-L{{.*}}/sysroot/usr/lib/aarch64-linux-android"
230230
// CHECK-AARCH64: "-L{{.*}}/lib/gcc/aarch64-linux-android/4.9/../../../../aarch64-linux-android/lib"
231231
//
232-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
233-
// RUN: -target arm64-linux-android21 \
232+
// RUN: %clang -### %s 2>&1 \
233+
// RUN: --target=arm64-linux-android21 \
234234
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
235235
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
236236
// RUN: | FileCheck --check-prefix=CHECK-ARM64 %s
237-
// CHECK-ARM64: {{.*}}clang{{.*}}" "-cc1"
237+
// CHECK-ARM64: "-cc1"
238238
// CHECK-ARM64: "-internal-isystem" "{{.*}}/include/c++/v1"
239239
// CHECK-ARM64: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include/aarch64-linux-android"
240240
// CHECK-ARM64: "-internal-externc-isystem" "{{.*}}/sysroot/include"
@@ -245,13 +245,13 @@
245245
// CHECK-ARM64: "-L{{.*}}/sysroot/usr/lib/aarch64-linux-android"
246246
// CHECK-ARM64: "-L{{.*}}/lib/gcc/aarch64-linux-android/4.9/../../../../aarch64-linux-android/lib"
247247
//
248-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
249-
// RUN: -target mipsel-linux-android21 \
248+
// RUN: %clang -### %s 2>&1 \
249+
// RUN: --target=mipsel-linux-android21 \
250250
// RUN: -mips32 \
251251
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
252252
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
253253
// RUN: | FileCheck --check-prefix=CHECK-MIPS %s
254-
// CHECK-MIPS: {{.*}}clang{{.*}}" "-cc1"
254+
// CHECK-MIPS: "-cc1"
255255
// CHECK-MIPS: "-internal-isystem" "{{.*}}/include/c++/v1"
256256
// CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/include"
257257
// CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include"
@@ -261,12 +261,12 @@
261261
// CHECK-MIPS: "-L{{.*}}/sysroot/usr/lib/mipsel-linux-android"
262262
// CHECK-MIPS: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.9/../../../../mipsel-linux-android/lib"
263263
//
264-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
265-
// RUN: -target i686-linux-android21 \
264+
// RUN: %clang -### %s 2>&1 \
265+
// RUN: --target=i686-linux-android21 \
266266
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
267267
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
268268
// RUN: | FileCheck --check-prefix=CHECK-I686 %s
269-
// CHECK-I686: {{.*}}clang{{.*}}" "-cc1"
269+
// CHECK-I686: "-cc1"
270270
// CHECK-I686: "-internal-isystem" "{{.*}}/include/c++/v1"
271271
// CHECK-I686: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include/i686-linux-android"
272272
// CHECK-I686: "-internal-externc-isystem" "{{.*}}/sysroot/include"
@@ -277,12 +277,12 @@
277277
// CHECK-I686: "-L{{.*}}/sysroot/usr/lib/i686-linux-android"
278278
// CHECK-I686: "-L{{.*}}/lib/gcc/i686-linux-android/4.9/../../../../i686-linux-android/lib"
279279
//
280-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
281-
// RUN: -target x86_64-linux-android21 \
280+
// RUN: %clang -### %s 2>&1 \
281+
// RUN: --target=x86_64-linux-android21 \
282282
// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
283283
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
284284
// RUN: | FileCheck --check-prefix=CHECK-X86_64 %s
285-
// CHECK-X86_64: {{.*}}clang{{.*}}" "-cc1"
285+
// CHECK-X86_64: "-cc1"
286286
// CHECK-X86_64: "-internal-isystem" "{{.*}}/include/c++/v1"
287287
// CHECK-X86_64: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include/x86_64-linux-android"
288288
// CHECK-X86_64: "-internal-externc-isystem" "{{.*}}/sysroot/include"

‎clang/test/Driver/android-standalone.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Test header and library paths when Clang is used with Android standalone
22
// toolchain.
33
//
4-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
5-
// RUN: -target arm-linux-androideabi -stdlib=libstdc++ \
4+
// RUN: %clang -### %s 2>&1 \
5+
// RUN: --target=arm-linux-androideabi -stdlib=libstdc++ \
66
// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \
77
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
88
// RUN: | FileCheck %s
9-
// CHECK: {{.*}}clang{{.*}}" "-cc1"
9+
// CHECK: "-cc1"
1010
// CHECK: "-internal-isystem" "{{.*}}/arm-linux-androideabi/include/c++/4.4.3"
1111
// CHECK: "-internal-isystem" "{{.*}}/arm-linux-androideabi/include/c++/4.4.3/arm-linux-androideabi"
1212
// CHECK: "-internal-externc-isystem" "{{.*}}/sysroot/include"
@@ -16,12 +16,12 @@
1616
// CHECK: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/lib"
1717
// CHECK: "-L{{.*}}/sysroot/usr/lib"
1818
//
19-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
20-
// RUN: -target aarch64-linux-android -stdlib=libstdc++ \
19+
// RUN: %clang -### %s 2>&1 \
20+
// RUN: --target=aarch64-linux-android -stdlib=libstdc++ \
2121
// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \
2222
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
2323
// RUN: | FileCheck --check-prefix=CHECK-AARCH64 %s
24-
// CHECK-AARCH64: {{.*}}clang{{.*}}" "-cc1"
24+
// CHECK-AARCH64: "-cc1"
2525
// CHECK-AARCH64: "-internal-isystem" "{{.*}}/aarch64-linux-android/include/c++/4.8"
2626
// CHECK-AARCH64: "-internal-isystem" "{{.*}}/aarch64-linux-android/include/c++/4.8/aarch64-linux-android"
2727
// CHECK-AARCH64: "-internal-externc-isystem" "{{.*}}/sysroot/include"
@@ -31,12 +31,12 @@
3131
// CHECK-AARCH64: "-L{{.*}}/lib/gcc/aarch64-linux-android/4.8/../../../../aarch64-linux-android/lib"
3232
// CHECK-AARCH64: "-L{{.*}}/sysroot/usr/lib"
3333
//
34-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
35-
// RUN: -target arm64-linux-android -stdlib=libstdc++ \
34+
// RUN: %clang -### %s 2>&1 \
35+
// RUN: --target=arm64-linux-android -stdlib=libstdc++ \
3636
// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \
3737
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
3838
// RUN: | FileCheck --check-prefix=CHECK-ARM64 %s
39-
// CHECK-ARM64: {{.*}}clang{{.*}}" "-cc1"
39+
// CHECK-ARM64: "-cc1"
4040
// CHECK-ARM64: "-internal-isystem" "{{.*}}/aarch64-linux-android/include/c++/4.8"
4141
// CHECK-ARM64: "-internal-isystem" "{{.*}}/aarch64-linux-android/include/c++/4.8/aarch64-linux-android"
4242
// CHECK-ARM64: "-internal-externc-isystem" "{{.*}}/sysroot/include"
@@ -46,13 +46,13 @@
4646
// CHECK-ARM64: "-L{{.*}}/lib/gcc/aarch64-linux-android/4.8/../../../../aarch64-linux-android/lib"
4747
// CHECK-ARM64: "-L{{.*}}/sysroot/usr/lib"
4848
//
49-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
50-
// RUN: -target mipsel-linux-android \
49+
// RUN: %clang -### %s 2>&1 \
50+
// RUN: --target=mipsel-linux-android \
5151
// RUN: -mips32 -stdlib=libstdc++ \
5252
// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \
5353
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
5454
// RUN: | FileCheck --check-prefix=CHECK-MIPS %s
55-
// CHECK-MIPS: {{.*}}clang{{.*}}" "-cc1"
55+
// CHECK-MIPS: "-cc1"
5656
// CHECK-MIPS: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3"
5757
// CHECK-MIPS: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3/mipsel-linux-android"
5858
// CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/include"
@@ -62,13 +62,13 @@
6262
// CHECK-MIPS: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.4.3/../../../../mipsel-linux-android/lib"
6363
// CHECK-MIPS: "-L{{.*}}/sysroot/usr/lib"
6464
//
65-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
66-
// RUN: -target mipsel-linux-android \
65+
// RUN: %clang -### %s 2>&1 \
66+
// RUN: --target=mipsel-linux-android \
6767
// RUN: -march=mips32 -mips32r2 -stdlib=libstdc++ \
6868
// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \
6969
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
7070
// RUN: | FileCheck --check-prefix=CHECK-MIPSR2 %s
71-
// CHECK-MIPSR2: {{.*}}clang{{.*}}" "-cc1"
71+
// CHECK-MIPSR2: "-cc1"
7272
// CHECK-MIPSR2: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3"
7373
// CHECK-MIPSR2: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3/mipsel-linux-android"
7474
// CHECK-MIPSR2: "-internal-externc-isystem" "{{.*}}/sysroot/include"
@@ -78,13 +78,13 @@
7878
// CHECK-MIPSR2: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.4.3/../../../../mipsel-linux-android/lib"
7979
// CHECK-MIPSR2: "-L{{.*}}/sysroot/usr/lib"
8080
//
81-
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
82-
// RUN: -target mipsel-linux-android \
81+
// RUN: %clang -### %s 2>&1 \
82+
// RUN: --target=mipsel-linux-android \
8383
// RUN: -mips32 -march=mips32r2 -stdlib=libstdc++ \
8484
// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \
8585
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
8686
// RUN: | FileCheck --check-prefix=CHECK-MIPSR2-A %s
87-
// CHECK-MIPSR2-A: {{.*}}clang{{.*}}" "-cc1"
87+
// CHECK-MIPSR2-A: "-cc1"
8888
// CHECK-MIPSR2-A: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3"
8989
// CHECK-MIPSR2-A: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3/mipsel-linux-android"
9090
// CHECK-MIPSR2-A: "-internal-externc-isystem" "{{.*}}/sysroot/include"

‎clang/test/Driver/cuda-march.cu

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@
55
// REQUIRES: x86-registered-target
66
// REQUIRES: nvptx-registered-target
77

8-
// RUN: %clang -no-canonical-prefixes -### -target x86_64-linux-gnu -c \
8+
// RUN: %clang -### --target=x86_64-linux-gnu -c \
99
// RUN: -march=haswell %s 2>&1 | FileCheck %s
10-
// RUN: %clang -no-canonical-prefixes -### -target x86_64-linux-gnu -c \
10+
// RUN: %clang -### --target=x86_64-linux-gnu -c \
1111
// RUN: -march=haswell --cuda-gpu-arch=sm_35 %s 2>&1 | FileCheck %s
1212

13-
// CHECK: {{.*}}clang{{.*}}" "-cc1"
14-
// CHECK-SAME: "-triple" "nvptx
13+
// CHECK: "-cc1"{{.*}} "-triple" "nvptx
1514
// CHECK-SAME: "-target-cpu" "sm_35"
1615

1716
// CHECK: ptxas
1817
// CHECK-SAME: "--gpu-name" "sm_35"
1918

20-
// CHECK: {{.*}}clang{{.*}}" "-cc1"
21-
// CHECK-SAME: "-target-cpu" "haswell"
19+
// CHECK: "-cc1"{{.*}} "-target-cpu" "haswell"

0 commit comments

Comments
 (0)