Bug 1253464 - Remove --enable-wrap-malloc/--with-wrap-malloc from js/src/old-configure.in draft
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 04 Mar 2016 09:40:45 +0900
changeset 336645 edefedca2f3e2a6c9c03c03a788826bdc1ed1227
parent 336612 2f159d07bda9d2482314200e6bdb7ef066dd24e4
child 336646 2168d41b17c87030217f5c5190e656d6c91bafac
push id12160
push userbmo:mh+mozilla@glandium.org
push dateFri, 04 Mar 2016 00:49:18 +0000
bugs1253464, 1080341
milestone47.0a1
Bug 1253464 - Remove --enable-wrap-malloc/--with-wrap-malloc from js/src/old-configure.in for the same reason as they were removed in bug 1080341 for the top-level, and the additional reason that configure.py doesn't support --enable and --with options with the same name.
js/src/old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -2800,46 +2800,16 @@ AC_SUBST(MOZ_JEMALLOC4)
 if test -n "$MOZ_JEMALLOC4"; then
   AC_DEFINE(MOZ_JEMALLOC4)
 fi
 AC_SUBST(MOZ_CRT)
 AC_SUBST(MOZ_GLUE_IN_PROGRAM)
 AC_SUBST_LIST(MOZ_GLUE_WRAP_LDFLAGS)
 
 dnl ========================================================
-dnl = Use malloc wrapper lib
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(wrap-malloc,
-[  --enable-wrap-malloc    Wrap malloc calls (gnu linker only)],
-    _WRAP_MALLOC=1,
-    _WRAP_MALLOC= )
-
-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=strdup,--wrap=strndup"
-        WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=posix_memalign,--wrap=malloc_usable_size"
-        dnl Wrap operator new and operator delete on Android.
-        if test "$OS_TARGET" = "Android"; then
-            WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=_Znwj,--wrap=_Znaj,--wrap=_ZdlPv,--wrap=_ZdaPv"
-        fi
-    else
-        AC_MSG_ERROR([--enable-wrap-malloc is not supported for non-GNU toolchains])
-    fi
-fi
-
-dnl ========================================================
-dnl = Location of malloc wrapper lib
-dnl ========================================================
-MOZ_ARG_WITH_STRING(wrap-malloc,
-[  --with-wrap-malloc=DIR  Location of malloc wrapper library],
-    WRAP_LDFLAGS="${WRAP_LDFLAGS} $withval")
-
-dnl ========================================================
 dnl = Use a smaller chunk size for GC chunks
 dnl ========================================================
 dnl Use large (1MB) chunks by default.  For B2G this option is used to give
 dnl smaller (currently 256K) chunks.
 MOZ_ARG_ENABLE_BOOL(small-chunk-size,
 [  --enable-small-chunk-size  Allocate memory for JS GC things in smaller chunks],
     JS_GC_SMALL_CHUNK_SIZE=1,
     JS_GC_SMALL_CHUNK_SIZE= )