diff options
| author | Alexander Potapenko <glider@google.com> | 2012-08-15 12:23:36 +0000 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2012-08-15 12:23:36 +0000 |
| commit | 20f9fcc285b15bad193b46365af9f02312d9c546 (patch) | |
| tree | b63a64d7fa23bc2a85c788af6d3f68cb4cb754b5 | |
| parent | e1c54262f4322653040c2a118b8c58ab8adb5a56 (diff) | |
| download | bcm5719-llvm-20f9fcc285b15bad193b46365af9f02312d9c546.tar.gz bcm5719-llvm-20f9fcc285b15bad193b46365af9f02312d9c546.zip | |
Move the prototype of __CFInitialize to asan_mac.h so that asan_malloc_mac.cc may use it in the dynamic library mode.
llvm-svn: 161945
| -rw-r--r-- | compiler-rt/lib/asan/asan_mac.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/asan_mac.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_mac.cc b/compiler-rt/lib/asan/asan_mac.cc index a3d39e7ae05..bd44305b2cb 100644 --- a/compiler-rt/lib/asan/asan_mac.cc +++ b/compiler-rt/lib/asan/asan_mac.cc @@ -404,8 +404,6 @@ INTERCEPTOR(CFStringRef, CFStringCreateCopy, CFAllocatorRef alloc, DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr) -extern "C" -void __CFInitialize(); DECLARE_REAL_AND_INTERCEPTOR(void, __CFInitialize) namespace __asan { diff --git a/compiler-rt/lib/asan/asan_mac.h b/compiler-rt/lib/asan/asan_mac.h index 6c65765a804..a52268b2fc1 100644 --- a/compiler-rt/lib/asan/asan_mac.h +++ b/compiler-rt/lib/asan/asan_mac.h @@ -43,6 +43,9 @@ enum { MACOS_VERSION_LION }; +// Used by asan_malloc_mac.cc and asan_mac.cc +extern "C" void __CFInitialize(); + namespace __asan { int GetMacosVersion(); |
