Skip to content

Commit 6b0c8c4

Browse files
authored
Revert "[NFC][CFI] Avoid clang error in CFI tests" (#136030)
Reverts #135981 Fails with 'clang: error: --rtlib=libgcc requires --unwindlib=libgcc' on some bots.
1 parent cbbf6b4 commit 6b0c8c4

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

clang/test/Driver/sanitizer-ld.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -840,8 +840,7 @@
840840
// CHECK-CFI-PREREQ-LINUX: '-fsanitize=cfi' only allowed with '-fvisibility='
841841

842842
// CFI by itself does not link runtime libraries.
843-
// RUN: %clang -fsanitize=cfi \
844-
// RUN: -flto -fvisibility=hidden \
843+
// RUN: not %clang -fsanitize=cfi \
845844
// RUN: --target=x86_64-unknown-linux -fuse-ld=ld -rtlib=platform \
846845
// RUN: -resource-dir=%S/Inputs/resource_dir \
847846
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
@@ -850,8 +849,7 @@
850849
// CHECK-CFI-LINUX: "{{.*}}ld{{(.exe)?}}"
851850

852851
// CFI with diagnostics links the UBSan runtime.
853-
// RUN: %clang -fsanitize=cfi -fno-sanitize-trap=cfi -fsanitize-recover=cfi \
854-
// RUN: -flto -fvisibility=hidden \
852+
// RUN: not %clang -fsanitize=cfi -fno-sanitize-trap=cfi -fsanitize-recover=cfi \
855853
// RUN: --target=x86_64-unknown-linux -fuse-ld=ld \
856854
// RUN: -resource-dir=%S/Inputs/resource_dir \
857855
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
@@ -861,8 +859,7 @@
861859
// CHECK-CFI-DIAG-LINUX: "--whole-archive" "{{[^"]*}}libclang_rt.ubsan_standalone.a" "--no-whole-archive"
862860

863861
// Cross-DSO CFI links the CFI runtime.
864-
// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \
865-
// RUN: -flto -fvisibility=hidden \
862+
// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \
866863
// RUN: --target=x86_64-unknown-linux -fuse-ld=ld \
867864
// RUN: -resource-dir=%S/Inputs/resource_dir \
868865
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
@@ -873,8 +870,7 @@
873870
// CHECK-CFI-CROSS-DSO-LINUX: -export-dynamic
874871

875872
// Cross-DSO CFI with diagnostics links just the CFI runtime.
876-
// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \
877-
// RUN: -flto -fvisibility=hidden \
873+
// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \
878874
// RUN: -fno-sanitize-trap=cfi -fsanitize-recover=cfi \
879875
// RUN: --target=x86_64-unknown-linux -fuse-ld=ld \
880876
// RUN: -resource-dir=%S/Inputs/resource_dir \
@@ -886,8 +882,7 @@
886882
// CHECK-CFI-CROSS-DSO-DIAG-LINUX: -export-dynamic
887883

888884
// Cross-DSO CFI on Android does not link runtime libraries.
889-
// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \
890-
// RUN: -flto -fvisibility=hidden \
885+
// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \
891886
// RUN: --target=aarch64-linux-android -fuse-ld=ld \
892887
// RUN: -resource-dir=%S/Inputs/resource_dir \
893888
// RUN: --sysroot=%S/Inputs/basic_android_tree \
@@ -896,8 +891,7 @@
896891
// CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}"
897892

898893
// Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime.
899-
// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \
900-
// RUN: -flto -fvisibility=hidden \
894+
// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \
901895
// RUN: -fno-sanitize-trap=cfi -fsanitize-recover=cfi \
902896
// RUN: --target=aarch64-linux-android -fuse-ld=ld \
903897
// RUN: -resource-dir=%S/Inputs/resource_dir \

0 commit comments

Comments
 (0)