Bug 286849 - [PATCH] Interceptors for new/delete on Darwin were erroneously commented...

diff --git a/NEWS b/NEWS
index b1b27e815b7d04ab3fed5016dea3c84783a59ff0..f6608c70fe7035286bbe441daf3f58a0b18ef14a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -82,6 +82,8 @@ bugzilla (https://bugs.kde.org/enter_bug.cgi?product=valgrind) rather
 than mailing the developers (or mailing lists) directly -- bugs that
 are not entered into bugzilla tend to get forgotten about or ignored.
 
+286849  [PATCH] Interceptors for new/delete on Darwin were erroneously
+        commented out in r12043
 306098  s390x: Alternate opcode form for convert to/from fixed and friends
 309100  s390x: Testcases for extended BFP
 309554  Wrap syscall remap_file_pages (216)

diff --git a/coregrind/m_replacemalloc/vg_replace_malloc.c b/coregrind/m_replacemalloc/vg_replace_malloc.c
index 0438fbdf0a222a62d67091635ddd9c6017918265..a7a6719857b84f9bc95736a4b453a45e8c107223 100644 (file)
--- a/coregrind/m_replacemalloc/vg_replace_malloc.c
+++ b/coregrind/m_replacemalloc/vg_replace_malloc.c
@@ -507,7 +507,7 @@ extern int * __error(void) __attribute__((weak));
  #if VG_WORDSIZE == 4
   ALLOC_or_BOMB(VG_Z_LIBSTDCXX_SONAME, _Znwj,          __builtin_new);
   ALLOC_or_BOMB(VG_Z_LIBCXX_SONAME,    _Znwj,          __builtin_new);
-  ALLOC_or_BOMB(VG_Z_LIBC_SONAME,      _Znwj,          __builtin_new);
+  ALLOC_or_BOMB(SO_SYN_MALLOC,         _Znwj,          __builtin_new);
  #endif
  // operator new(unsigned long)
  #if VG_WORDSIZE == 8
@@ -627,7 +627,7 @@ extern int * __error(void) __attribute__((weak));
  #if VG_WORDSIZE == 4
   ALLOC_or_NULL(VG_Z_LIBSTDCXX_SONAME, _ZnwjRKSt9nothrow_t,  __builtin_new);
   ALLOC_or_NULL(VG_Z_LIBCXX_SONAME,    _ZnwjRKSt9nothrow_t,  __builtin_new);
-  ALLOC_or_NULL(VG_Z_LIBC_SONAME,      _ZnwjRKSt9nothrow_t,  __builtin_new);
+  ALLOC_or_NULL(SO_SYN_MALLOC,         _ZnwjRKSt9nothrow_t,  __builtin_new);
  #endif
  // operator new(unsigned long, std::nothrow_t const&)
  #if VG_WORDSIZE == 8
@@ -870,7 +870,7 @@ extern int * __error(void) __attribute__((weak));
  #if VG_WORDSIZE == 4
   ALLOC_or_NULL(VG_Z_LIBSTDCXX_SONAME, _ZnajRKSt9nothrow_t, __builtin_vec_new );
   ALLOC_or_NULL(VG_Z_LIBCXX_SONAME,    _ZnajRKSt9nothrow_t, __builtin_vec_new );
-  ALLOC_or_NULL(VG_Z_LIBC_SONAME,      _ZnajRKSt9nothrow_t, __builtin_vec_new );
+  ALLOC_or_NULL(SO_SYN_MALLOC,         _ZnajRKSt9nothrow_t, __builtin_vec_new );
  #endif
  // operator new[](unsigned long, std::nothrow_t const&)
  #if VG_WORDSIZE == 8