| Index: third_party/tcmalloc/chromium/src/base/atomicops-internals-arm-v6plus.h
|
| diff --git a/third_party/tcmalloc/vendor/src/base/atomicops-internals-arm-v6plus.h b/third_party/tcmalloc/chromium/src/base/atomicops-internals-arm-v6plus.h
|
| similarity index 99%
|
| copy from third_party/tcmalloc/vendor/src/base/atomicops-internals-arm-v6plus.h
|
| copy to third_party/tcmalloc/chromium/src/base/atomicops-internals-arm-v6plus.h
|
| index 8d5b9b5342f171cce39629c39c433bc8b81ee515..dc069870d8963309eca373784e9dcf8eef71000d 100644
|
| --- a/third_party/tcmalloc/vendor/src/base/atomicops-internals-arm-v6plus.h
|
| +++ b/third_party/tcmalloc/chromium/src/base/atomicops-internals-arm-v6plus.h
|
| @@ -40,6 +40,7 @@
|
|
|
| #include <stdio.h>
|
| #include <stdlib.h>
|
| +#include "base/abort.h"
|
| #include "base/basictypes.h" // For COMPILE_ASSERT
|
|
|
| // The LDREXD and STREXD instructions in ARM all v7 variants or above. In v6,
|
| @@ -287,7 +288,7 @@ inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
|
| inline void NotImplementedFatalError(const char *function_name) {
|
| fprintf(stderr, "64-bit %s() not implemented on this platform\n",
|
| function_name);
|
| - abort();
|
| + tcmalloc::Abort();
|
| }
|
|
|
| inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
|
|
|