Author: Krasimir Georgiev Date: 2021-12-24T12:01:36+01:00 New Revision: 969a51ff363263a3b5f2df55eba6b4d392bf30c0
URL: https://github.com/llvm/llvm-project/commit/969a51ff363263a3b5f2df55eba6b4d392bf30c0 DIFF: https://github.com/llvm/llvm-project/commit/969a51ff363263a3b5f2df55eba6b4d392bf30c0.diff LOG: Revert "[ASan] Moved optimized callbacks into a separate library." We need some internal updates for this, shared directly with the author. This reverts commit 71b3bfde9cd296525bbf5b1619e199074156d12b. Added: Modified: clang/lib/Driver/ToolChains/CommonArgs.cpp clang/test/Driver/sanitizer-ld.c compiler-rt/lib/asan/CMakeLists.txt compiler-rt/lib/asan/tests/CMakeLists.txt Removed: compiler-rt/lib/asan/asan_rtl_static.cpp ################################################################################ diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index 267625c70b251..407f81a2ae09a 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -826,11 +826,6 @@ collectSanitizerRuntimes(const ToolChain &TC, const ArgList &Args, if (SanArgs.needsStatsRt() && SanArgs.linkRuntimes()) StaticRuntimes.push_back("stats_client"); - // Always link the static runtime regardless of DSO or executable. - if (SanArgs.needsAsanRt()) { - HelperStaticRuntimes.push_back("asan_static"); - } - // Collect static runtimes. if (Args.hasArg(options::OPT_shared)) { // Don't link static runtimes into DSOs. diff --git a/clang/test/Driver/sanitizer-ld.c b/clang/test/Driver/sanitizer-ld.c index ea8c49f2384ad..d62e19fd4021b 100644 --- a/clang/test/Driver/sanitizer-ld.c +++ b/clang/test/Driver/sanitizer-ld.c @@ -22,7 +22,7 @@ // RUN: --sysroot=%S/Inputs/basic_linux_tree \ // RUN: | FileCheck --check-prefix=CHECK-ASAN-NO-LINK-RUNTIME-LINUX %s // -// CHECK-ASAN-NO-LINK-RUNTIME-LINUX-NOT: libclang_rt.asan-x86_64 +// CHECK-ASAN-NO-LINK-RUNTIME-LINUX-NOT: libclang_rt.asan // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ // RUN: -target i386-unknown-linux -fuse-ld=ld -fsanitize=address -shared-libsan \ diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index b79b7278f6dbb..2e63c8d051688 100644 --- a/compiler-rt/lib/asan/CMakeLists.txt +++ b/compiler-rt/lib/asan/CMakeLists.txt @@ -34,6 +34,7 @@ set(ASAN_SOURCES if (NOT WIN32 AND NOT APPLE) list(APPEND ASAN_SOURCES + asan_rtl_x86_64.S asan_interceptors_vfork.S ) endif() @@ -42,16 +43,6 @@ set(ASAN_CXX_SOURCES asan_new_delete.cpp ) -set(ASAN_STATIC_SOURCES - asan_rtl_static.cpp - ) - -if (NOT WIN32 AND NOT APPLE) - list(APPEND ASAN_STATIC_SOURCES - asan_rtl_x86_64.S - ) -endif() - set(ASAN_PREINIT_SOURCES asan_preinit.cpp ) @@ -144,12 +135,6 @@ if(NOT APPLE) ADDITIONAL_HEADERS ${ASAN_HEADERS} CFLAGS ${ASAN_CFLAGS} DEFS ${ASAN_COMMON_DEFINITIONS}) - add_compiler_rt_object_libraries(RTAsan_static - ARCHS ${ASAN_SUPPORTED_ARCH} - SOURCES ${ASAN_STATIC_SOURCES} - ADDITIONAL_HEADERS ${ASAN_HEADERS} - CFLAGS ${ASAN_CFLAGS} - DEFS ${ASAN_COMMON_DEFINITIONS}) add_compiler_rt_object_libraries(RTAsan_preinit ARCHS ${ASAN_SUPPORTED_ARCH} SOURCES ${ASAN_PREINIT_SOURCES} @@ -191,14 +176,6 @@ if(APPLE) LINK_FLAGS ${WEAK_SYMBOL_LINK_FLAGS} DEFS ${ASAN_DYNAMIC_DEFINITIONS} PARENT_TARGET asan) - - add_compiler_rt_runtime(clang_rt.asan_static - STATIC - ARCHS ${ASAN_SUPPORTED_ARCH} - OBJECT_LIBS RTAsan_static - CFLAGS ${ASAN_CFLAGS} - DEFS ${ASAN_COMMON_DEFINITIONS} - PARENT_TARGET asan) else() # Build separate libraries for each target. @@ -230,14 +207,6 @@ else() DEFS ${ASAN_COMMON_DEFINITIONS} PARENT_TARGET asan) - add_compiler_rt_runtime(clang_rt.asan_static - STATIC - ARCHS ${ASAN_SUPPORTED_ARCH} - OBJECT_LIBS RTAsan_static - CFLAGS ${ASAN_CFLAGS} - DEFS ${ASAN_COMMON_DEFINITIONS} - PARENT_TARGET asan) - add_compiler_rt_runtime(clang_rt.asan-preinit STATIC ARCHS ${ASAN_SUPPORTED_ARCH} diff --git a/compiler-rt/lib/asan/asan_rtl_static.cpp b/compiler-rt/lib/asan/asan_rtl_static.cpp deleted file mode 100644 index 74e6eb0ddf1cf..0000000000000 --- a/compiler-rt/lib/asan/asan_rtl_static.cpp +++ /dev/null @@ -1,15 +0,0 @@ -//===-- asan_static_rtl.cpp -----------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// This file is a part of AddressSanitizer, an address sanity checker. -// -// Main file of the ASan run-time library. -//===----------------------------------------------------------------------===// - -// This file is empty for now. Main reason to have it is workaround for Windows -// build, which complains because no files are part of the asan_static lib. diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt index 95a324766ae7c..cc375acf2dfbc 100644 --- a/compiler-rt/lib/asan/tests/CMakeLists.txt +++ b/compiler-rt/lib/asan/tests/CMakeLists.txt @@ -261,7 +261,6 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID) set(ASAN_TEST_RUNTIME_OBJECTS $<TARGET_OBJECTS:RTAsan.${arch}> $<TARGET_OBJECTS:RTAsan_cxx.${arch}> - $<TARGET_OBJECTS:RTAsan_static.${arch}> $<TARGET_OBJECTS:RTInterception.${arch}> $<TARGET_OBJECTS:RTSanitizerCommon.${arch}> $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}> @@ -287,7 +286,6 @@ if(ANDROID) # Test w/o ASan instrumentation. Link it with ASan statically. add_executable(AsanNoinstTest # FIXME: .arch? $<TARGET_OBJECTS:RTAsan.${arch}> - $<TARGET_OBJECTS:RTAsan_static.${arch}> $<TARGET_OBJECTS:RTInterception.${arch}> $<TARGET_OBJECTS:RTSanitizerCommon.${arch}> $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
