From ae08a22cc215448aa3ad5a6fb099f6df77e9fa01 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Fri, 27 Jan 2017 23:53:20 +0000 Subject: Revert "Stop intercepting some malloc-related functions on FreeBSD and macOS" This reverts r293337, which breaks tests on Windows: malloc-no-intercept-499eb7.o : error LNK2019: unresolved external symbol _mallinfo referenced in function _main git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@293346 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/sanitizer_common/tests/sanitizer_allocator_testlib.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'lib/sanitizer_common/tests') diff --git a/lib/sanitizer_common/tests/sanitizer_allocator_testlib.cc b/lib/sanitizer_common/tests/sanitizer_allocator_testlib.cc index d2920d8f7..c6dd3c4bb 100644 --- a/lib/sanitizer_common/tests/sanitizer_allocator_testlib.cc +++ b/lib/sanitizer_common/tests/sanitizer_allocator_testlib.cc @@ -139,7 +139,6 @@ void *realloc(void *p, size_t size) { return p; } -#if SANITIZER_INTERCEPT_MEMALIGN void *memalign(size_t alignment, size_t size) { if (UNLIKELY(!thread_inited)) thread_init(); @@ -147,7 +146,6 @@ void *memalign(size_t alignment, size_t size) { SANITIZER_MALLOC_HOOK(p, size); return p; } -#endif // SANITIZER_INTERCEPT_MEMALIGN int posix_memalign(void **memptr, size_t alignment, size_t size) { if (UNLIKELY(!thread_inited)) @@ -167,26 +165,18 @@ void *valloc(size_t size) { return p; } -#if SANITIZER_INTERCEPT_CFREE void cfree(void *p) ALIAS("free"); -#endif // SANITIZER_INTERCEPT_CFREE -#if SANITIZER_INTERCEPT_PVALLOC void *pvalloc(size_t size) ALIAS("valloc"); -#endif // SANITIZER_INTERCEPT_PVALLOC -#if SANITIZER_INTERCEPT_MEMALIGN void *__libc_memalign(size_t alignment, size_t size) ALIAS("memalign"); -#endif // SANITIZER_INTERCEPT_MEMALIGN void malloc_usable_size() { } -#if SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO void mallinfo() { } void mallopt() { } -#endif // SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO } // extern "C" namespace std { -- cgit v1.2.3