diff options
| author | Reid Kleckner <rnk@google.com> | 2016-10-11 23:13:13 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-10-11 23:13:13 +0000 |
| commit | a3350556432bd2fe670662d6d77a80d3d2bf00d0 (patch) | |
| tree | a959f619ab39da798a9b79bb6ab272f0317eb078 | |
| parent | 038febb3e40a3bcfdaad2a9c1c040a3140fc6a4b (diff) | |
| download | bcm5719-llvm-a3350556432bd2fe670662d6d77a80d3d2bf00d0.tar.gz bcm5719-llvm-a3350556432bd2fe670662d6d77a80d3d2bf00d0.zip | |
Fix _recalloc redefinition link error in ASan RTL
Fixes PR30329
Patch by Hans-Bernhard Broeker!
llvm-svn: 283955
| -rw-r--r-- | compiler-rt/lib/asan/asan_malloc_win.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler-rt/lib/asan/asan_malloc_win.cc b/compiler-rt/lib/asan/asan_malloc_win.cc index 4a233dfe968..05148d51e6b 100644 --- a/compiler-rt/lib/asan/asan_malloc_win.cc +++ b/compiler-rt/lib/asan/asan_malloc_win.cc @@ -125,6 +125,11 @@ void *_recalloc(void *p, size_t n, size_t elem_size) { } ALLOCATION_FUNCTION_ATTRIBUTE +void *_recalloc_base(void *p, size_t n, size_t elem_size) { + return _recalloc(p, n, elem_size); +} + +ALLOCATION_FUNCTION_ATTRIBUTE size_t _msize(const void *ptr) { GET_CURRENT_PC_BP_SP; (void)sp; @@ -223,6 +228,7 @@ void ReplaceSystemMalloc() { TryToOverrideFunction("_realloc_base", (uptr)realloc); TryToOverrideFunction("_realloc_crt", (uptr)realloc); TryToOverrideFunction("_recalloc", (uptr)_recalloc); + TryToOverrideFunction("_recalloc_base", (uptr)_recalloc); TryToOverrideFunction("_recalloc_crt", (uptr)_recalloc); TryToOverrideFunction("_msize", (uptr)_msize); TryToOverrideFunction("_expand", (uptr)_expand); |
