Author: Dmitry Chestnykh Date: 2025-07-12T09:44:14+03:00 New Revision: 593fd44a9dcf77db8348c37d70cfecef57c392c7
URL: https://github.com/llvm/llvm-project/commit/593fd44a9dcf77db8348c37d70cfecef57c392c7 DIFF: https://github.com/llvm/llvm-project/commit/593fd44a9dcf77db8348c37d70cfecef57c392c7.diff LOG: [clang] Don't pass sanitizers' rtlibs to linker with `-r` (#147905) If clang is invoked with `-r` (relocatable linking) then we shouldn't construct sanitizer arguments and then pass sanitizer runtime libs to the linker GCC also skips runtime linking if `-r` is also here Added: Modified: clang/lib/Driver/SanitizerArgs.cpp clang/test/Driver/sanitizer-ld.c Removed: ################################################################################ diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index 4bd61c2f8deef..21e4cff6309c3 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -1157,9 +1157,9 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, !TC.getTriple().isAndroid() && !TC.getTriple().isOSFuchsia(); } - LinkRuntimes = - Args.hasFlag(options::OPT_fsanitize_link_runtime, - options::OPT_fno_sanitize_link_runtime, LinkRuntimes); + LinkRuntimes = Args.hasFlag(options::OPT_fsanitize_link_runtime, + options::OPT_fno_sanitize_link_runtime, + !Args.hasArg(options::OPT_r)); // Parse -link-cxx-sanitizer flag. LinkCXXRuntimes = D.CCCIsCXX(); diff --git a/clang/test/Driver/sanitizer-ld.c b/clang/test/Driver/sanitizer-ld.c index d2e4877e89d78..ac1851286af63 100644 --- a/clang/test/Driver/sanitizer-ld.c +++ b/clang/test/Driver/sanitizer-ld.c @@ -1369,3 +1369,27 @@ // CHECK-DSO-SHARED-HWASAN-AARCH64-LINUX-NOT: "-lresolv" // CHECK-DSO-SHARED-HWASAN-AARCH64-LINUX-NOT: "--export-dynamic" // CHECK-DSO-SHARED-HWASAN-AARCH64-LINUX-NOT: "--dynamic-list" + +// RUN: %clang -fsanitize=address,undefined -r -### %s 2>&1 \ +// RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ +// RUN: -resource-dir=%S/Inputs/resource_dir \ +// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +// RUN: | %{filecheck} --check-prefix=CHECK-RELOCATABLE-LINK-ASAN-UBSAN-RTLIB +// +// CHECK-RELOCATABLE-LINK-ASAN-UBSAN-RTLIB-NOT: "{{.*}}(asan|ubsan){{.*}}" + +// RUN: %clang -fsanitize=address -r -fsanitize-link-runtime -### %s 2>&1 \ +// RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ +// RUN: -resource-dir=%S/Inputs/resource_dir \ +// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +// RUN: | FileCheck %s --check-prefix=CHECK-RELOCATABLE-LINK-FORCE-LINK-ASAN +// +// CHECK-RELOCATABLE-LINK-FORCE-LINK-ASAN: "{{.*}}asan{{.*}}" + +// RUN: %clang -fsanitize=thread -r -### %s 2>&1 \ +// RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ +// RUN: -resource-dir=%S/Inputs/resource_dir \ +// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +// RUN: | %{filecheck} --check-prefix=CHECK-RELOCATABLE-LINK-TSAN-RTLIB +// +// CHECK-RELOCATABLE-LINK-TSAN-RTLIB-NOT: "{{.*}}tsan{{.*}}" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
