summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2012-10-24 09:19:16 +0000
committerAlexander Potapenko <glider@google.com>2012-10-24 09:19:16 +0000
commitfaa9c86fd0eb978eb537a484b2d101e8974e6d10 (patch)
tree7174297c8123929759dd67a84fc8d84268262d99
parentcea6239219f83e9fd3cfc6fd75e4c91ce31bbb73 (diff)
downloadbcm5719-llvm-faa9c86fd0eb978eb537a484b2d101e8974e6d10.tar.gz
bcm5719-llvm-faa9c86fd0eb978eb537a484b2d101e8974e6d10.zip
[ASan] Use internal_memmove() in both static and dynamic runtime libraries if asan_inited != 0.
llvm-svn: 166549
-rw-r--r--compiler-rt/lib/asan/asan_interceptors.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler-rt/lib/asan/asan_interceptors.cc b/compiler-rt/lib/asan/asan_interceptors.cc
index 1fec3b6dd2c..d679863eaa1 100644
--- a/compiler-rt/lib/asan/asan_interceptors.cc
+++ b/compiler-rt/lib/asan/asan_interceptors.cc
@@ -249,9 +249,7 @@ INTERCEPTOR(void*, memcpy, void *to, const void *from, uptr size) {
}
INTERCEPTOR(void*, memmove, void *to, const void *from, uptr size) {
-#if MAC_INTERPOSE_FUNCTIONS
- if (!asan_inited) return REAL(memmove)(to, from, size);
-#endif
+ if (!asan_inited) return internal_memmove(to, from, size);
if (asan_init_is_running) {
return REAL(memmove)(to, from, size);
}
OpenPOWER on IntegriCloud