4 |
4 |
5 diff --git a/memory/mozalloc/mozalloc.cpp b/memory/mozalloc/mozalloc.cpp |
5 diff --git a/memory/mozalloc/mozalloc.cpp b/memory/mozalloc/mozalloc.cpp |
6 --- a/memory/mozalloc/mozalloc.cpp |
6 --- a/memory/mozalloc/mozalloc.cpp |
7 +++ b/memory/mozalloc/mozalloc.cpp |
7 +++ b/memory/mozalloc/mozalloc.cpp |
8 @@ -208,6 +208,8 @@ |
8 @@ -208,6 +208,8 @@ |
9 } |
9 #endif // if defined(HAVE_VALLOC) |
10 #endif |
10 |
11 |
11 #ifndef MOZ_STATIC_RUNTIME |
12 +extern "C" size_t malloc_usable_size(const void *ptr); |
12 +extern "C" size_t malloc_usable_size(const void *ptr); |
13 + |
13 + |
14 size_t |
14 size_t |
15 moz_malloc_usable_size(void *ptr) |
15 moz_malloc_usable_size(void *ptr) |
16 { |
16 { |
17 diff --git a/memory/mozalloc/mozalloc_abort.cpp b/memory/mozalloc/mozalloc_abort.cpp |
17 diff --git a/memory/mozalloc/mozalloc_abort.cpp b/memory/mozalloc/mozalloc_abort.cpp |
18 --- a/memory/mozalloc/mozalloc_abort.cpp |
18 --- a/memory/mozalloc/mozalloc_abort.cpp |
19 +++ b/memory/mozalloc/mozalloc_abort.cpp |
19 +++ b/memory/mozalloc/mozalloc_abort.cpp |
20 @@ -63,7 +63,11 @@ |
20 @@ -63,7 +63,11 @@ |
21 // Define abort() here, so that it is used instead of the system abort(). This |
21 // |
22 // lets us control the behavior when aborting, in order to get better results |
22 // That segmentation fault will be interpreted as another bug by ASan and as a |
23 // on *NIX platforms. See mozalloc_abort for details. |
23 // result, ASan will just exit(1) instead of aborting. |
24 +#if defined(SOLARIS) |
24 +#if defined(SOLARIS) |
25 +void std::abort(void) |
25 +void std::abort(void) |
26 +#else |
26 +#else |
27 void abort(void) |
27 void abort(void) |
28 +#endif |
28 +#endif |