Bug 736959 - Don't wrap PR_Malloc and other NSPR allocation functions. r=khuey

This commit is contained in:
Mike Hommey 2012-03-22 08:01:27 +01:00
parent c77ce8b769
commit bd6a8730b3
3 changed files with 0 additions and 13 deletions

View File

@ -7248,7 +7248,6 @@ if test -n "$_WRAP_MALLOC"; then
if test -n "$GNU_CC"; then
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=malloc,--wrap=calloc,--wrap=valloc,--wrap=free,--wrap=realloc,--wrap=memalign"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=__builtin_new,--wrap=__builtin_vec_new,--wrap=__builtin_delete,--wrap=__builtin_vec_delete"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=PR_Free,--wrap=PR_Malloc,--wrap=PR_Calloc,--wrap=PR_Realloc"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=strdup,--wrap=strndup"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=posix_memalign,--wrap=malloc_usable_size"
else

View File

@ -4148,7 +4148,6 @@ if test -n "$_WRAP_MALLOC"; then
if test "$GNU_CC"; then
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=malloc,--wrap=calloc,--wrap=valloc,--wrap=free,--wrap=realloc,--wrap=memalign"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=__builtin_new,--wrap=__builtin_vec_new,--wrap=__builtin_delete,--wrap=__builtin_vec_delete"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=PR_Free,--wrap=PR_Malloc,--wrap=PR_Calloc,--wrap=PR_Realloc"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=strdup,--wrap=strndup"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=posix_memalign,--wrap=malloc_usable_size"
else

View File

@ -6211,17 +6211,6 @@ malloc_shutdown()
* names it is given with __wrap_.
*/
#define wrap(a) __wrap_ ## a
/* Extra wrappers for NSPR alloc functions */
void *
__wrap_PR_Malloc(size_t size) __attribute__((alias("__wrap_malloc")));
void *
__wrap_PR_Calloc(size_t num, size_t size) __attribute__((alias("__wrap_calloc")));
void *
__wrap_PR_Realloc(void *ptr, size_t size) __attribute__((alias("__wrap_realloc")));
void
__wrap_PR_Free(void *ptr) __attribute__((alias("__wrap_free")));
#else
#define wrap(a) je_ ## a
#endif