summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2015-02-04 12:42:12 +0000
committerAlexander Potapenko <glider@google.com>2015-02-04 12:42:12 +0000
commit42fa73cef0a974bb98fcd341a94cc3286a593a58 (patch)
tree3e894e91d8d4183ca08f71b566842d95dd5964ac
parent1f92ce67c5dcc34e815ad103be0fcf7fce25fcac (diff)
downloadbcm5719-llvm-42fa73cef0a974bb98fcd341a94cc3286a593a58.tar.gz
bcm5719-llvm-42fa73cef0a974bb98fcd341a94cc3286a593a58.zip
[ASan] Add the new __asan_mz_* symbols to asan_interface_internal.h
to fix the interface_symbols_darwin.c test. llvm-svn: 228137
-rw-r--r--compiler-rt/lib/asan/asan_interface_internal.h18
-rw-r--r--compiler-rt/lib/asan/asan_malloc_mac.cc2
2 files changed, 19 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_interface_internal.h b/compiler-rt/lib/asan/asan_interface_internal.h
index edaf44d7893..5fee44c4dd4 100644
--- a/compiler-rt/lib/asan/asan_interface_internal.h
+++ b/compiler-rt/lib/asan/asan_interface_internal.h
@@ -177,6 +177,24 @@ extern "C" {
void __asan_poison_intra_object_redzone(uptr p, uptr size);
SANITIZER_INTERFACE_ATTRIBUTE
void __asan_unpoison_intra_object_redzone(uptr p, uptr size);
+#if SANITIZER_MAC
+ SANITIZER_INTERFACE_ATTRIBUTE
+ void * __asan_mz_calloc(void *zone, uptr nmemb, uptr size);
+ SANITIZER_INTERFACE_ATTRIBUTE
+ void __asan_mz_destroy(void* zone);
+ SANITIZER_INTERFACE_ATTRIBUTE
+ void __asan_mz_free(void *zone, void *ptr);
+ SANITIZER_INTERFACE_ATTRIBUTE
+ void * __asan_mz_malloc(void *zone, uptr size);
+ SANITIZER_INTERFACE_ATTRIBUTE
+ void * __asan_mz_memalign(void *zone, uptr align, uptr size);
+ SANITIZER_INTERFACE_ATTRIBUTE
+ void * __asan_mz_realloc(void *zone, void *ptr, uptr size);
+ SANITIZER_INTERFACE_ATTRIBUTE
+ uptr __asan_mz_size(void *zone, const void* ptr);
+ SANITIZER_INTERFACE_ATTRIBUTE
+ void * __asan_mz_valloc(void *zone, uptr size);
+#endif // SANITIZER_MAC
} // extern "C"
#endif // ASAN_INTERFACE_INTERNAL_H
diff --git a/compiler-rt/lib/asan/asan_malloc_mac.cc b/compiler-rt/lib/asan/asan_malloc_mac.cc
index d7a6307c9bd..c145ee6e393 100644
--- a/compiler-rt/lib/asan/asan_malloc_mac.cc
+++ b/compiler-rt/lib/asan/asan_malloc_mac.cc
@@ -156,7 +156,7 @@ namespace {
// wrappers, as they are basically copied from there.
extern "C"
SANITIZER_INTERFACE_ATTRIBUTE
-size_t __asan_mz_size(malloc_zone_t* zone, const void* ptr) {
+size_t __asan_mz_size(malloc_zone_t *zone, const void* ptr) {
return asan_mz_size(ptr);
}
OpenPOWER on IntegriCloud