From fb1a9f17e36bbe08dfb4929b602f39b46dccc853 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Tue, 28 May 2013 11:05:05 +0000 Subject: [PATCH] [nolibc] Make SymbolizerPrepareForSandboxing weak and optional. Differential Revision: http://llvm-reviews.chandlerc.com/D872 llvm-svn: 182765 --- compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | 3 ++- compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc index 6e234e5f1e1d..bcf6ad13806a 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc @@ -307,7 +307,8 @@ void PrepareForSandboxing() { // cached mappings. MemoryMappingLayout::CacheMemoryMappings(); // Same for /proc/self/exe in the symbolizer. - SymbolizerPrepareForSandboxing(); + if (&SymbolizerPrepareForSandboxing) + SymbolizerPrepareForSandboxing(); } // ----------------- sanitizer_procmaps.h diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h index b6471db6a687..20bc775ff19a 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h @@ -114,7 +114,7 @@ typedef bool (*string_predicate_t)(const char *); uptr GetListOfModules(LoadedModule *modules, uptr max_modules, string_predicate_t filter); -void SymbolizerPrepareForSandboxing(); +void SymbolizerPrepareForSandboxing() SANITIZER_WEAK_ATTRIBUTE; } // namespace __sanitizer