Author: Vitaly Buka Date: 2025-04-16T13:56:38-07:00 New Revision: 6b0c8c4acd31eba83bf20ab1cf8729b2153e383c
URL: https://github.com/llvm/llvm-project/commit/6b0c8c4acd31eba83bf20ab1cf8729b2153e383c DIFF: https://github.com/llvm/llvm-project/commit/6b0c8c4acd31eba83bf20ab1cf8729b2153e383c.diff LOG: Revert "[NFC][CFI] Avoid clang error in CFI tests" (#136030) Reverts llvm/llvm-project#135981 Fails with 'clang: error: --rtlib=libgcc requires --unwindlib=libgcc' on some bots. Added: Modified: clang/test/Driver/sanitizer-ld.c Removed: ################################################################################ diff --git a/clang/test/Driver/sanitizer-ld.c b/clang/test/Driver/sanitizer-ld.c index a00ec029d3d46..67ca33d676d20 100644 --- a/clang/test/Driver/sanitizer-ld.c +++ b/clang/test/Driver/sanitizer-ld.c @@ -840,8 +840,7 @@ // CHECK-CFI-PREREQ-LINUX: '-fsanitize=cfi' only allowed with '-fvisibility=' // CFI by itself does not link runtime libraries. -// RUN: %clang -fsanitize=cfi \ -// RUN: -flto -fvisibility=hidden \ +// RUN: not %clang -fsanitize=cfi \ // RUN: --target=x86_64-unknown-linux -fuse-ld=ld -rtlib=platform \ // RUN: -resource-dir=%S/Inputs/resource_dir \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \ @@ -850,8 +849,7 @@ // CHECK-CFI-LINUX: "{{.*}}ld{{(.exe)?}}" // CFI with diagnostics links the UBSan runtime. -// RUN: %clang -fsanitize=cfi -fno-sanitize-trap=cfi -fsanitize-recover=cfi \ -// RUN: -flto -fvisibility=hidden \ +// RUN: not %clang -fsanitize=cfi -fno-sanitize-trap=cfi -fsanitize-recover=cfi \ // RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \ @@ -861,8 +859,7 @@ // CHECK-CFI-DIAG-LINUX: "--whole-archive" "{{[^"]*}}libclang_rt.ubsan_standalone.a" "--no-whole-archive" // Cross-DSO CFI links the CFI runtime. -// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ -// RUN: -flto -fvisibility=hidden \ +// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ // RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \ @@ -873,8 +870,7 @@ // CHECK-CFI-CROSS-DSO-LINUX: -export-dynamic // Cross-DSO CFI with diagnostics links just the CFI runtime. -// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ -// RUN: -flto -fvisibility=hidden \ +// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ // RUN: -fno-sanitize-trap=cfi -fsanitize-recover=cfi \ // RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ @@ -886,8 +882,7 @@ // CHECK-CFI-CROSS-DSO-DIAG-LINUX: -export-dynamic // Cross-DSO CFI on Android does not link runtime libraries. -// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ -// RUN: -flto -fvisibility=hidden \ +// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ // RUN: --target=aarch64-linux-android -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ // RUN: --sysroot=%S/Inputs/basic_android_tree \ @@ -896,8 +891,7 @@ // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}" // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime. -// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ -// RUN: -flto -fvisibility=hidden \ +// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ // RUN: -fno-sanitize-trap=cfi -fsanitize-recover=cfi \ // RUN: --target=aarch64-linux-android -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits