| Index: base/allocator/allocator_shim.cc
|
| diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc
|
| index 36736cdc78d79105718b3f0790f843dc3dd63a76..fc391b0bbe429301d2fd99ca325e3534f50f68ce 100644
|
| --- a/base/allocator/allocator_shim.cc
|
| +++ b/base/allocator/allocator_shim.cc
|
| @@ -292,10 +292,12 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) {
|
|
|
| } // extern "C"
|
|
|
| -#if !defined(OS_WIN) && !defined(OS_MACOSX)
|
| +#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_AIX)
|
| // Cpp symbols (new / delete) should always be routed through the shim layer
|
| // except on Windows and macOS where the malloc intercept is deep enough that it
|
| // also catches the cpp calls.
|
| +// This currently can't be done on AIX based on how
|
| +// allocator_shim_default_dispatch_to_glibc.cc is set up.
|
| #include "base/allocator/allocator_shim_override_cpp_symbols.h"
|
| #endif
|
|
|
|
|