Skip to content

Commit 530db7b

Browse files
committed
fix tests
1 parent e0ba172 commit 530db7b

32 files changed

+296
-17
lines changed

clang/test/Driver/aarch64-toolchain.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
// Test interaction with -fuse-ld=lld
44
// RUN: %clang -### %s -fuse-ld=lld -B%S/Inputs/lld \
5+
// RUN: -no-canonical-prefixes \
56
// RUN: --target=aarch64-none-elf --rtlib=libgcc --unwindlib=platform \
67
// RUN: --gcc-toolchain=%S/Inputs/basic_aarch64_gcc_tree \
78
// RUN: --sysroot=%S/Inputs/basic_aarch64_gcc_tree/aarch64-none-elf 2>&1 \
@@ -20,6 +21,7 @@
2021
// LLD-AARCH64-BAREMETAL: "{{.*}}/Inputs/basic_aarch64_gcc_tree/lib/gcc/aarch64-none-elf/8.2.1/crtend.o"
2122

2223
// RUN: %clang -### %s -fuse-ld= \
24+
// RUN: -no-canonical-prefixes \
2325
// RUN: --target=aarch64-none-elf --rtlib=libgcc --unwindlib=platform \
2426
// RUN: --gcc-toolchain=%S/Inputs/basic_aarch64_gcc_tree \
2527
// RUN: --sysroot=%S/Inputs/basic_aarch64_gcc_tree/aarch64-none-elf 2>&1 \
@@ -39,6 +41,7 @@
3941
// C-AARCH64-BAREMETAL: "{{.*}}/Inputs/basic_aarch64_gcc_tree/lib/gcc/aarch64-none-elf/8.2.1/crtend.o"
4042

4143
// RUN: %clang -### %s -fuse-ld= \
44+
// RUN: -no-canonical-prefixes \
4245
// RUN: --target=aarch64-none-elf --rtlib=libgcc --unwindlib=platform \
4346
// RUN: --gcc-toolchain=%S/Inputs/basic_aarch64_gcc_tree \
4447
// RUN: --sysroot= 2>&1 \
@@ -56,6 +59,7 @@
5659
// C-AARCH64-BAREMETAL-NOSYSROOT: "{{.*}}/Inputs/basic_aarch64_gcc_tree/lib/gcc/aarch64-none-elf/8.2.1/crtend.o"
5760

5861
// RUN: %clangxx -### %s -fuse-ld= \
62+
// RUN: -no-canonical-prefixes \
5963
// RUN: --target=aarch64-none-elf -stdlib=libstdc++ --rtlib=libgcc --unwindlib=platform \
6064
// RUN: --gcc-toolchain=%S/Inputs/basic_aarch64_gcc_tree \
6165
// RUN: --sysroot=%S/Inputs/basic_aarch64_gcc_tree/aarch64-none-elf 2>&1 \
@@ -76,6 +80,7 @@
7680
// CXX-AARCH64-BAREMETAL: "{{.*}}/Inputs/basic_aarch64_gcc_tree/lib/gcc/aarch64-none-elf/8.2.1/crtend.o"
7781

7882
// RUN: %clangxx -### %s -fuse-ld= \
83+
// RUN: -no-canonical-prefixes \
7984
// RUN: --target=aarch64-none-elf -stdlib=libstdc++ --rtlib=libgcc --unwindlib=platform \
8085
// RUN: --gcc-toolchain=%S/Inputs/basic_aarch64_gcc_tree \
8186
// RUN: --sysroot= 2>&1 \
@@ -95,6 +100,7 @@
95100
// CXX-AARCH64-BAREMETAL-NOSYSROOT: "{{.*}}/Inputs/basic_aarch64_gcc_tree/lib/gcc/aarch64-none-elf/8.2.1/crtend.o"
96101

97102
// RUN: %clangxx -### %s -fuse-ld= \
103+
// RUN: -no-canonical-prefixes \
98104
// RUN: --target=aarch64-none-elf -stdlib=libc++ --rtlib=libgcc --unwindlib=platform \
99105
// RUN: --gcc-toolchain=%S/Inputs/basic_aarch64_gcc_tree \
100106
// RUN: --sysroot=%S/Inputs/basic_aarch64_gcc_tree/aarch64-none-elf 2>&1 \
@@ -114,6 +120,7 @@
114120
// CXX-AARCH64-BAREMETAL-LIBCXX: "{{.*}}/Inputs/basic_aarch64_gcc_tree/lib/gcc/aarch64-none-elf/8.2.1/crtend.o"
115121

116122
// RUN: %clangxx -### %s -fuse-ld= \
123+
// RUN: -no-canonical-prefixes \
117124
// RUN: --target=aarch64-none-elf -stdlib=libc++ --rtlib=libgcc --unwindlib=platform \
118125
// RUN: --gcc-toolchain=%S/Inputs/basic_aarch64_gcc_tree \
119126
// RUN: --sysroot= 2>&1 \

clang/test/Driver/android-installed-libcxx.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,25 @@
1616
// RUN: mkdir -p %t2/include/aarch64-none-linux-android23/c++/v1
1717

1818
// RUN: %clang -target aarch64-none-linux-android -ccc-install-dir %/t2/bin \
19+
// RUN: -no-canonical-prefixes \
1920
// RUN: --sysroot=%t2/sysroot -stdlib=libc++ -fsyntax-only \
2021
// RUN: %s -### 2>&1 | FileCheck --check-prefix=ANDROID-DIR -DDIR=%/t2/bin %s
2122

2223
// RUN: %clang -target aarch64-none-linux-android21 -ccc-install-dir %/t2/bin \
24+
// RUN: -no-canonical-prefixes \
2325
// RUN: --sysroot=%t2/sysroot -stdlib=libc++ -fsyntax-only \
2426
// RUN: %s -### 2>&1 | FileCheck --check-prefix=ANDROID-DIR -DDIR=%/t2/bin %s
2527

2628
// ANDROID-DIR: "-internal-isystem" "[[DIR]][[SEP:/|\\\\]]..[[SEP]]include[[SEP]]aarch64-none-linux-android[[SEP]]c++[[SEP]]v1"
2729
// ANDROID-DIR-SAME: "-internal-isystem" "[[DIR]][[SEP]]..[[SEP]]include[[SEP]]c++[[SEP]]v1"
2830

2931
// RUN: %clang -target aarch64-none-linux-android23 -ccc-install-dir %/t2/bin \
32+
// RUN: -no-canonical-prefixes \
3033
// RUN: --sysroot=%t2/sysroot -stdlib=libc++ -fsyntax-only \
3134
// RUN: %s -### 2>&1 | FileCheck --check-prefix=ANDROID23-DIR -DDIR=%/t2/bin %s
3235

3336
// RUN: %clang -target aarch64-none-linux-android28 -ccc-install-dir %/t2/bin \
37+
// RUN: -no-canonical-prefixes \
3438
// RUN: --sysroot=%t2/sysroot -stdlib=libc++ -fsyntax-only \
3539
// RUN: %s -### 2>&1 | FileCheck --check-prefix=ANDROID23-DIR -DDIR=%/t2/bin %s
3640

clang/test/Driver/arm-toolchain.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// UNSUPPORTED: system-windows
22

33
// RUN: %clang -### %s -fuse-ld=lld -B%S/Inputs/lld \
4+
// RUN: -no-canonical-prefixes \
45
// RUN: --target=armv6m-none-eabi --rtlib=libgcc --unwindlib=platform \
56
// RUN: --gcc-toolchain=%S/Inputs/basic_arm_gcc_tree \
67
// RUN: --sysroot=%S/Inputs/basic_arm_gcc_tree/armv6m-none-eabi 2>&1 \
@@ -19,6 +20,7 @@
1920
// LLD-ARM-BAREMETAL: "{{.*}}/Inputs/basic_arm_gcc_tree/lib/gcc/armv6m-none-eabi/8.2.1/crtend.o"
2021

2122
// RUN: %clang -### %s -fuse-ld= \
23+
// RUN: -no-canonical-prefixes \
2224
// RUN: --target=armv6m-none-eabi --rtlib=libgcc --unwindlib=platform \
2325
// RUN: --gcc-toolchain=%S/Inputs/basic_arm_gcc_tree \
2426
// RUN: --sysroot=%S/Inputs/basic_arm_gcc_tree/armv6m-none-eabi 2>&1 \
@@ -38,6 +40,7 @@
3840
// C-ARM-BAREMETAL: "{{.*}}/Inputs/basic_arm_gcc_tree/lib/gcc/armv6m-none-eabi/8.2.1/crtend.o"
3941

4042
// RUN: %clang -### %s -fuse-ld= \
43+
// RUN: -no-canonical-prefixes \
4144
// RUN: --target=armv6m-none-eabi --rtlib=libgcc --unwindlib=platform \
4245
// RUN: --gcc-toolchain=%S/Inputs/basic_arm_gcc_tree \
4346
// RUN: --sysroot= 2>&1 \
@@ -55,6 +58,7 @@
5558
// C-ARM-BAREMETAL-NOSYSROOT: "{{.*}}/Inputs/basic_arm_gcc_tree/lib/gcc/armv6m-none-eabi/8.2.1/crtend.o"
5659

5760
// RUN: %clangxx -### %s -fuse-ld= \
61+
// RUN: -no-canonical-prefixes \
5862
// RUN: --target=armv6m-none-eabi -stdlib=libstdc++ --rtlib=libgcc --unwindlib=platform \
5963
// RUN: --gcc-toolchain=%S/Inputs/basic_arm_gcc_tree \
6064
// RUN: --sysroot=%S/Inputs/basic_arm_gcc_tree/armv6m-none-eabi 2>&1 \
@@ -77,6 +81,7 @@
7781

7882

7983
// RUN: %clangxx -### %s -fuse-ld= \
84+
// RUN: -no-canonical-prefixes \
8085
// RUN: --target=armv6m-none-eabi -stdlib=libstdc++ --rtlib=libgcc --unwindlib=platform \
8186
// RUN: --gcc-toolchain=%S/Inputs/basic_arm_gcc_tree \
8287
// RUN: --sysroot= 2>&1 \
@@ -96,6 +101,7 @@
96101
// CXX-ARM-BAREMETAL-NOSYSROOT: "{{.*}}/Inputs/basic_arm_gcc_tree/lib/gcc/armv6m-none-eabi/8.2.1/crtend.o"
97102

98103
// RUN: %clangxx -### %s -fuse-ld= \
104+
// RUN: -no-canonical-prefixes \
99105
// RUN: --target=armv6m-none-eabi -stdlib=libc++ --rtlib=libgcc --unwindlib=platform \
100106
// RUN: --gcc-toolchain=%S/Inputs/basic_arm_gcc_tree \
101107
// RUN: --sysroot=%S/Inputs/basic_arm_gcc_tree/armv6m-none-eabi 2>&1 \
@@ -115,6 +121,7 @@
115121
// CXX-ARM-BAREMETAL-LIBCXX: "{{.*}}/Inputs/basic_arm_gcc_tree/lib/gcc/armv6m-none-eabi/8.2.1/crtend.o"
116122

117123
// RUN: %clangxx -### %s -fuse-ld= \
124+
// RUN: -no-canonical-prefixes \
118125
// RUN: --target=armv6m-none-eabi -stdlib=libc++ --rtlib=libgcc --unwindlib=platform \
119126
// RUN: --gcc-toolchain=%S/Inputs/basic_arm_gcc_tree \
120127
// RUN: --sysroot= 2>&1 \

clang/test/Driver/avr-toolchain.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// UNSUPPORTED: system-windows
22
// A basic clang -cc1 command-line.
33

4-
// RUN: %clang -### %s --target=avr --sysroot=%S/Inputs/basic_avr_tree -resource-dir=%S/Inputs/resource_dir 2>&1 | FileCheck --check-prefix=CHECK1 %s
4+
// RUN: %clang -### %s -no-canonical-prefixes --target=avr --sysroot=%S/Inputs/basic_avr_tree -resource-dir=%S/Inputs/resource_dir 2>&1 | FileCheck --check-prefix=CHECK1 %s
55
// CHECK1: "-cc1" "-triple" "avr"
66
// CHECK1-SAME: "-resource-dir" "[[RESOURCE:[^"]+]]"
77
// CHECK1-SAME: "-isysroot" "[[SYSROOT:[^"]+/basic_avr_tree]]"
@@ -12,13 +12,13 @@
1212
// CHECK1-SAME: "-o" "a.out"
1313
// CHECK1-SAME: {{^}} "--gc-sections"
1414

15-
// RUN: %clang -### %s --target=avr --sysroot=%S/Inputs/basic_avr_tree_2/opt/local -S 2>&1 | FileCheck --check-prefix=CHECK2 %s
15+
// RUN: %clang -### %s -no-canonical-prefixes --target=avr --sysroot=%S/Inputs/basic_avr_tree_2/opt/local -S 2>&1 | FileCheck --check-prefix=CHECK2 %s
1616
// CHECK2: "-cc1" "-triple" "avr"
1717
// CHECK2-SAME: "-isysroot" "[[SYSROOT:[^"]+/basic_avr_tree_2/opt/local]]"
1818
// CHECK2-SAME: "-internal-isystem"
1919
// CHECK2-SAME: {{^}} "[[SYSROOT]]/lib/gcc/avr/10.3.0/../../../../avr/include"
2020

21-
// RUN: %clang -### %s --target=avr --sysroot=%S/Inputs/basic_avr_tree_2 -S 2>&1 | FileCheck --check-prefix=CHECK3 %s
21+
// RUN: %clang -### %s -no-canonical-prefixes --target=avr --sysroot=%S/Inputs/basic_avr_tree_2 -S 2>&1 | FileCheck --check-prefix=CHECK3 %s
2222
// CHECK3: "-cc1" "-triple" "avr"
2323
// CHECK3-SAME: "-isysroot" "[[SYSROOT:[^"]+/basic_avr_tree_2]]"
2424
// CHECK3-SAME: "-internal-isystem"
@@ -32,8 +32,8 @@
3232
// CHECK4-NOT: "-fno-use-init-array"
3333
// CHECK4-NOT: "-fno-use-cxa-atexit"
3434

35-
// RUN: %clang -### %s --target=avr --sysroot=%S/Inputs/basic_avr_tree 2>&1 -nostdinc | FileCheck --check-prefix=NOSTDINC %s
36-
// RUN: %clang -### %s --target=avr --sysroot=%S/Inputs/basic_avr_tree 2>&1 -nostdlibinc | FileCheck --check-prefix=NOSTDINC %s
35+
// RUN: %clang -### %s -no-canonical-prefixes --target=avr --sysroot=%S/Inputs/basic_avr_tree 2>&1 -nostdinc | FileCheck --check-prefix=NOSTDINC %s
36+
// RUN: %clang -### %s -no-canonical-prefixes --target=avr --sysroot=%S/Inputs/basic_avr_tree 2>&1 -nostdlibinc | FileCheck --check-prefix=NOSTDINC %s
3737
// NOSTDINC-NOT: "-internal-isystem" {{".*avr/include"}}
3838

3939
// RUN: %clang -### --target=avr --sysroot=%S/Inputs/basic_avr_tree -mmcu=atmega328 %s 2>&1 | FileCheck --check-prefix=NOWARN %s

clang/test/Driver/baremetal.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// CHECK-STATIC-LIB: {{.*}}llvm-ar{{.*}}" "rcsD"
66

77
// RUN: %clang %s -### --target=armv6m-none-eabi -o %t.out 2>&1 \
8+
// RUN: -no-canonical-prefixes \
89
// RUN: -T semihosted.lds \
910
// RUN: -L some/directory/user/asked/for \
1011
// RUN: --sysroot=%S/Inputs/baremetal_arm \
@@ -33,6 +34,7 @@
3334
// CHECK-V6M-LIBINC-NOT: "-internal-isystem"
3435

3536
// RUN: %clang %s -### --target=armv6m-none-eabi -o %t.out 2>&1 \
37+
// RUN: -no-canonical-prefixes \
3638
// RUN: -ccc-install-dir %S/Inputs/basic_baremetal_tree/bin \
3739
// RUN: | FileCheck --check-prefix=CHECK-V6M-TREE %s
3840
// CHECK-V6M-TREE: InstalledDir: [[INSTALLED_DIR:.+]]

clang/test/Driver/cygwin.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// RUN: %clang -### %s --target=i686-pc-windows-cygnus --sysroot=%S/Inputs/basic_cygwin_tree \
2+
// RUN: -no-canonical-prefixes \
23
// RUN: -resource-dir=%S/Inputs/resource_dir \
34
// RUN: --stdlib=platform 2>&1 | FileCheck --check-prefix=CHECK %s
45
// CHECK: "-cc1"
@@ -31,13 +32,15 @@
3132
// CHECK-SHARED-SAME: "-shared"
3233

3334
// RUN: %clang -### -o %t %s 2>&1 -no-integrated-as -fuse-ld=ld \
35+
// RUN: -no-canonical-prefixes \
3436
// RUN: --gcc-toolchain=%S/Inputs/basic_cross_cygwin_tree/usr \
3537
// RUN: --target=i686-pc-cygwin \
3638
// RUN: | FileCheck --check-prefix=CHECK-CROSS %s
3739
// CHECK-CROSS: "-cc1" "-triple" "i686-pc-windows-cygnus"
3840
// CHECK-CROSS: "{{.*}}/Inputs/basic_cross_cygwin_tree/usr/lib/gcc/i686-pc-msys/10/../../../../i686-pc-msys/bin{{(/|\\\\)}}as" "--32"
3941

4042
// RUN: %clang -### %s --target=x86_64-pc-windows-cygnus --sysroot=%S/Inputs/basic_cygwin_tree \
43+
// RUN: -no-canonical-prefixes \
4144
// RUN: -resource-dir=%S/Inputs/resource_dir \
4245
// RUN: --stdlib=platform 2>&1 | FileCheck --check-prefix=CHECK-64 %s
4346
// CHECK-64: "-cc1"

clang/test/Driver/darwin-header-search-libcxx-2.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
// RUN: | FileCheck -DTOOLCHAIN=%t/install \
5151
// RUN: -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr_cxx_v1 \
5252
// RUN: --check-prefix=CHECK-TOOLCHAIN-INCLUDE-CXX-V1 %s
53-
// CHECK-TOOLCHAIN-INCLUDE-CXX-V1: "-internal-isystem" "[[TOOLCHAIN]]/bin/../include/c++/v1"
53+
// CHECK-TOOLCHAIN-INCLUDE-CXX-V1: "-internal-isystem" "[[TOOLCHAIN]]/include/c++/v1"
5454
// CHECK-TOOLCHAIN-INCLUDE-CXX-V1-NOT: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/v1"
5555

5656
// Headers in (2) and nowhere else -> (2) is used
@@ -61,4 +61,4 @@
6161
// RUN: | FileCheck -DTOOLCHAIN=%t/install \
6262
// RUN: -DSYSROOT=%S/Inputs/basic_darwin_sdk_no_libcxx \
6363
// RUN: --check-prefix=CHECK-TOOLCHAIN-NO-SYSROOT %s
64-
// CHECK-TOOLCHAIN-NO-SYSROOT: "-internal-isystem" "[[TOOLCHAIN]]/bin/../include/c++/v1"
64+
// CHECK-TOOLCHAIN-NO-SYSROOT: "-internal-isystem" "[[TOOLCHAIN]]/include/c++/v1"

clang/test/Driver/darwin-header-search-libcxx.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// Check with only headers alongside the installation (those should be used).
1717
//
1818
// RUN: %clang -### %s -fsyntax-only 2>&1 \
19+
// RUN: -no-canonical-prefixes \
1920
// RUN: --target=x86_64-apple-darwin \
2021
// RUN: -stdlib=libc++ \
2122
// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \
@@ -27,6 +28,7 @@
2728
// CHECK-LIBCXX-TOOLCHAIN-1-NOT: "-internal-isystem" "/usr/include/c++/v1"
2829
//
2930
// RUN: %clang -### %s -fsyntax-only 2>&1 \
31+
// RUN: -no-canonical-prefixes \
3032
// RUN: --target=x86_64-apple-darwin \
3133
// RUN: -stdlib=libc++ \
3234
// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \
@@ -41,6 +43,7 @@
4143
// Check with only headers in the sysroot (those should be used).
4244
//
4345
// RUN: %clang -### %s -fsyntax-only 2>&1 \
46+
// RUN: -no-canonical-prefixes \
4447
// RUN: --target=x86_64-apple-darwin \
4548
// RUN: -stdlib=libc++ \
4649
// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \
@@ -58,6 +61,7 @@
5861
// over --sysroot.
5962
//
6063
// RUN: %clang -### %s -fsyntax-only 2>&1 \
64+
// RUN: -no-canonical-prefixes \
6165
// RUN: --target=x86_64-apple-darwin \
6266
// RUN: -stdlib=libc++ \
6367
// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \
@@ -68,6 +72,7 @@
6872
// RUN: --check-prefix=CHECK-LIBCXX-SYSROOT_AND_TOOLCHAIN-1 %s
6973
//
7074
// RUN: %clang -### %s -fsyntax-only 2>&1 \
75+
// RUN: -no-canonical-prefixes \
7176
// RUN: --target=x86_64-apple-darwin \
7277
// RUN: -stdlib=libc++ \
7378
// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \
@@ -78,6 +83,7 @@
7883
// RUN: --check-prefix=CHECK-LIBCXX-SYSROOT_AND_TOOLCHAIN-1 %s
7984
//
8085
// RUN: %clang -### %s -fsyntax-only 2>&1 \
86+
// RUN: -no-canonical-prefixes \
8187
// RUN: --target=x86_64-apple-darwin \
8288
// RUN: -stdlib=libc++ \
8389
// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \

clang/test/Driver/gcc-install-dir.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
/// Test native GCC installation on Arch Linux i686.
44
// RUN: %clang -### %s --target=i686-linux-gnu --sysroot=%S/Inputs/archlinux_i686_tree -ccc-install-dir %S/Inputs/basic_linux_tree/usr/bin \
5+
// RUN: -no-canonical-prefixes \
56
// RUN: --stdlib=platform --rtlib=platform --unwindlib=platform \
67
// RUN: --gcc-install-dir=%S/Inputs/archlinux_i686_tree/usr/lib/gcc/i686-pc-linux-gnu/11.1.0 2>&1 | FileCheck %s --check-prefix=ARCH_I686
78
// ARCH_I686: "-internal-isystem"
@@ -14,6 +15,7 @@
1415

1516
/// Test native GCC installation on Debian amd64. --gcc-install-dir= may end with /.
1617
// RUN: %clangxx %s -### --target=x86_64-unknown-linux-gnu --sysroot=%S/Inputs/debian_multiarch_tree \
18+
// RUN: -no-canonical-prefixes \
1719
// RUN: -ccc-install-dir %S/Inputs/basic_linux_tree/usr/bin -resource-dir=%S/Inputs/resource_dir --stdlib=platform --rtlib=platform --unwindlib=platform \
1820
// RUN: --gcc-install-dir=%S/Inputs/debian_multiarch_tree/usr/lib/gcc/x86_64-linux-gnu/10/ 2>&1 | FileCheck %s --check-prefix=DEBIAN_X86_64
1921
// DEBIAN_X86_64: "-internal-isystem"
@@ -28,6 +30,7 @@
2830

2931
/// Test -m32.
3032
// RUN: %clangxx %s -### --target=x86_64-unknown-linux-gnu -m32 --sysroot=%S/Inputs/debian_multiarch_tree \
33+
// RUN: -no-canonical-prefixes \
3134
// RUN: -ccc-install-dir %S/Inputs/basic_linux_tree/usr/bin -resource-dir=%S/Inputs/resource_dir --stdlib=platform --rtlib=platform --unwindlib=platform \
3235
// RUN: --gcc-install-dir=%S/Inputs/debian_multiarch_tree/usr/lib/gcc/x86_64-linux-gnu/10/ 2>&1 | FileCheck %s --check-prefix=DEBIAN_X86_64_M32
3336
// DEBIAN_X86_64_M32: "-internal-isystem"

clang/test/Driver/gcc-toolchain-rt-libs-multi.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// RUN: %clangxx %s -### -stdlib=libstdc++ --gcc-toolchain=%S/Inputs/gcc_version_parsing_rt_libs_multilib --target=x86_64-redhat-linux 2>&1 | FileCheck %s -check-prefix=X64-STDCPLUS
2-
// RUN: %clangxx %s -### -stdlib=libc++ --gcc-toolchain=%S/Inputs/gcc_version_parsing_rt_libs_multilib --target=x86_64-redhat-linux 2>&1 | FileCheck %s -check-prefix=X64-LIBCPLUS
3-
// RUN: %clangxx %s -m32 -### -stdlib=libstdc++ --gcc-toolchain=%S/Inputs/gcc_version_parsing_rt_libs_multilib --target=x86_64-redhat-linux 2>&1 | FileCheck %s -check-prefix=X32-STDCPLUS
4-
// RUN: %clangxx %s -m32 -### -stdlib=libc++ --gcc-toolchain=%S/Inputs/gcc_version_parsing_rt_libs_multilib --target=x86_64-redhat-linux 2>&1 | FileCheck %s -check-prefix=X32-LIBCPLUS
1+
// RUN: %clangxx %s -### -no-canonical-prefixes -stdlib=libstdc++ --gcc-toolchain=%S/Inputs/gcc_version_parsing_rt_libs_multilib --target=x86_64-redhat-linux 2>&1 | FileCheck %s -check-prefix=X64-STDCPLUS
2+
// RUN: %clangxx %s -### -no-canonical-prefixes -stdlib=libc++ --gcc-toolchain=%S/Inputs/gcc_version_parsing_rt_libs_multilib --target=x86_64-redhat-linux 2>&1 | FileCheck %s -check-prefix=X64-LIBCPLUS
3+
// RUN: %clangxx %s -m32 -### -no-canonical-prefixes -stdlib=libstdc++ --gcc-toolchain=%S/Inputs/gcc_version_parsing_rt_libs_multilib --target=x86_64-redhat-linux 2>&1 | FileCheck %s -check-prefix=X32-STDCPLUS
4+
// RUN: %clangxx %s -m32 -### -no-canonical-prefixes -stdlib=libc++ --gcc-toolchain=%S/Inputs/gcc_version_parsing_rt_libs_multilib --target=x86_64-redhat-linux 2>&1 | FileCheck %s -check-prefix=X32-LIBCPLUS
55

66
int main() {}
77

0 commit comments

Comments
 (0)