[compiler-rt] r291316 - Revert "Enable weak hooks on darwin"
Francis Ricci via llvm-commits
llvm-commits at lists.llvm.org
Fri Jan 6 16:38:25 PST 2017
Author: fjricci
Date: Fri Jan 6 18:38:24 2017
New Revision: 291316
URL: http://llvm.org/viewvc/llvm-project?rev=291316&view=rev
Log:
Revert "Enable weak hooks on darwin"
Reverts accidental upload.
This reverts commit 421408c0f2cc811bcf9a945be6e95e46f76cb358.
Removed:
compiler-rt/trunk/lib/asan/weak_symbols.txt
compiler-rt/trunk/lib/sanitizer_common/weak_symbols.txt
compiler-rt/trunk/lib/ubsan/weak_symbols.txt
Modified:
compiler-rt/trunk/cmake/Modules/SanitizerUtils.cmake
compiler-rt/trunk/lib/asan/CMakeLists.txt
compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h
compiler-rt/trunk/lib/stats/CMakeLists.txt
compiler-rt/trunk/lib/tsan/CMakeLists.txt
compiler-rt/trunk/lib/ubsan/CMakeLists.txt
Modified: compiler-rt/trunk/cmake/Modules/SanitizerUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/SanitizerUtils.cmake?rev=291316&r1=291315&r2=291316&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/SanitizerUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/SanitizerUtils.cmake Fri Jan 6 18:38:24 2017
@@ -46,15 +46,6 @@ macro(add_sanitizer_rt_symbols name)
endforeach()
endmacro()
-function(add_weak_symbols libname linkflags)
- file(STRINGS "${COMPILER_RT_SOURCE_DIR}/lib/${libname}/weak_symbols.txt" WEAK_SYMBOLS)
- set(local_linkflags ${${linkflags}})
- foreach(SYMBOL ${WEAK_SYMBOLS})
- set(local_linkflags ${local_linkflags} -Wl,-U,${SYMBOL})
- endforeach()
- set(${linkflags} ${local_linkflags} PARENT_SCOPE)
-endfunction()
-
macro(add_sanitizer_rt_version_list name)
set(vers ${CMAKE_CURRENT_BINARY_DIR}/${name}.vers)
cmake_parse_arguments(ARG "" "" "LIBS;EXTRA" ${ARGN})
Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=291316&r1=291315&r2=291316&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Fri Jan 6 18:38:24 2017
@@ -106,10 +106,6 @@ endif()
add_compiler_rt_component(asan)
if(APPLE)
- add_weak_symbols("asan" WEAK_SYMBOL_LINKFLAGS)
- add_weak_symbols("ubsan" WEAK_SYMBOL_LINKFLAGS)
- add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINKFLAGS)
-
add_compiler_rt_runtime(clang_rt.asan
SHARED
OS ${SANITIZER_COMMON_SUPPORTED_OS}
@@ -121,7 +117,6 @@ if(APPLE)
RTLSanCommon
RTUbsan
CFLAGS ${ASAN_DYNAMIC_CFLAGS}
- LINKFLAGS ${WEAK_SYMBOL_LINKFLAGS}
DEFS ${ASAN_DYNAMIC_DEFINITIONS}
PARENT_TARGET asan)
else()
Removed: compiler-rt/trunk/lib/asan/weak_symbols.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/weak_symbols.txt?rev=291315&view=auto
==============================================================================
--- compiler-rt/trunk/lib/asan/weak_symbols.txt (original)
+++ compiler-rt/trunk/lib/asan/weak_symbols.txt (removed)
@@ -1,3 +0,0 @@
-___asan_default_options
-___asan_default_suppressions
-___asan_on_error
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h?rev=291316&r1=291315&r2=291316&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h Fri Jan 6 18:38:24 2017
@@ -32,7 +32,7 @@
# define SANITIZER_WEAK_ATTRIBUTE __attribute__((weak))
#endif
-#if (SANITIZER_LINUX || SANITIZER_MAC || SANITIZER_WINDOWS) && !SANITIZER_GO
+#if (SANITIZER_LINUX || SANITIZER_WINDOWS) && !SANITIZER_GO
# define SANITIZER_SUPPORTS_WEAK_HOOKS 1
#else
# define SANITIZER_SUPPORTS_WEAK_HOOKS 0
Removed: compiler-rt/trunk/lib/sanitizer_common/weak_symbols.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/weak_symbols.txt?rev=291315&view=auto
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/weak_symbols.txt (original)
+++ compiler-rt/trunk/lib/sanitizer_common/weak_symbols.txt (removed)
@@ -1,6 +0,0 @@
-___sanitizer_free_hook
-___sanitizer_malloc_hook
-___sanitizer_symbolize_code
-___sanitizer_symbolize_data
-___sanitizer_symbolize_demangle
-___sanitizer_symbolize_flush
Modified: compiler-rt/trunk/lib/stats/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/stats/CMakeLists.txt?rev=291316&r1=291315&r2=291316&view=diff
==============================================================================
--- compiler-rt/trunk/lib/stats/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/stats/CMakeLists.txt Fri Jan 6 18:38:24 2017
@@ -5,14 +5,8 @@ set_target_properties(stats PROPERTIES F
if(APPLE)
set(STATS_LIB_FLAVOR SHARED)
-
- add_weak_symbols("asan" WEAK_SYMBOL_LINKFLAGS)
- add_weak_symbols("ubsan" WEAK_SYMBOL_LINKFLAGS)
- add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINKFLAGS)
else()
set(STATS_LIB_FLAVOR STATIC)
-
- set(WEAK_SYMBOL_LINKFLAGS)
endif()
add_compiler_rt_runtime(clang_rt.stats
@@ -23,7 +17,6 @@ add_compiler_rt_runtime(clang_rt.stats
OBJECT_LIBS RTSanitizerCommon
RTSanitizerCommonLibc
CFLAGS ${SANITIZER_COMMON_CFLAGS}
- LINKFLAGS ${WEAK_SYMBOL_LINKFLAGS}
PARENT_TARGET stats)
add_compiler_rt_runtime(clang_rt.stats_client
@@ -32,5 +25,4 @@ add_compiler_rt_runtime(clang_rt.stats_c
OS ${SANITIZER_COMMON_SUPPORTED_OS}
SOURCES stats_client.cc
CFLAGS ${SANITIZER_COMMON_CFLAGS}
- LINKFLAGS ${WEAK_SYMBOL_LINKFLAGS}
PARENT_TARGET stats)
Modified: compiler-rt/trunk/lib/tsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=291316&r1=291315&r2=291316&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/tsan/CMakeLists.txt Fri Jan 6 18:38:24 2017
@@ -107,10 +107,6 @@ if(APPLE)
# Pass ASM file directly to the C++ compiler.
set_source_files_properties(${TSAN_ASM_SOURCES} PROPERTIES LANGUAGE C)
endif()
-
- add_weak_symbols("ubsan" WEAK_SYMBOL_LINKFLAGS)
- add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINKFLAGS)
-
add_compiler_rt_runtime(clang_rt.tsan
SHARED
OS ${TSAN_SUPPORTED_OS}
@@ -121,7 +117,6 @@ if(APPLE)
RTSanitizerCommonLibc
RTUbsan
CFLAGS ${TSAN_RTL_CFLAGS}
- LINKFLAGS ${WEAK_SYMBOL_LINKFLAGS}
PARENT_TARGET tsan)
add_compiler_rt_object_libraries(RTTsan_dynamic
OS ${TSAN_SUPPORTED_OS}
Modified: compiler-rt/trunk/lib/ubsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/CMakeLists.txt?rev=291316&r1=291315&r2=291316&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/ubsan/CMakeLists.txt Fri Jan 6 18:38:24 2017
@@ -56,9 +56,6 @@ if(APPLE)
SOURCES ${UBSAN_STANDALONE_SOURCES}
CFLAGS ${UBSAN_STANDALONE_CFLAGS})
- add_weak_symbols("ubsan" WEAK_SYMBOL_LINKFLAGS)
- add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINKFLAGS)
-
add_compiler_rt_runtime(clang_rt.ubsan
SHARED
OS ${SANITIZER_COMMON_SUPPORTED_OS}
@@ -67,7 +64,6 @@ if(APPLE)
RTUbsan_standalone
RTSanitizerCommon
RTSanitizerCommonLibc
- LINKFLAGS ${WEAK_SYMBOL_LINKFLAGS}
PARENT_TARGET ubsan)
endif()
Removed: compiler-rt/trunk/lib/ubsan/weak_symbols.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/weak_symbols.txt?rev=291315&view=auto
==============================================================================
--- compiler-rt/trunk/lib/ubsan/weak_symbols.txt (original)
+++ compiler-rt/trunk/lib/ubsan/weak_symbols.txt (removed)
@@ -1 +0,0 @@
-___ubsan_default_options
More information about the llvm-commits
mailing list