diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | config.make.in | 2 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | malloc/Makefile | 4 |
5 files changed, 8 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index d42c5dd6a3..31fdf0d83d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-06-28 Ulrich Drepper <drepper@gmail.com> + + * configure.in: Remove support for --experimental-malloc option, make + it the default. + * config.make.in: Likewise. + * malloc/Makefile: Likewise. + 2011-06-27 Andreas Schwab <schwab@redhat.com> * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP diff --git a/config.make.in b/config.make.in index d722a8b684..0656b1bca0 100644 --- a/config.make.in +++ b/config.make.in @@ -85,8 +85,6 @@ have-ksh = @libc_cv_have_ksh@ sizeof-long-double = @sizeof_long_double@ -experimental-malloc = @experimental_malloc@ - nss-crypt = @libc_cv_nss_crypt@ # Configuration options. diff --git a/configure b/configure index 7814072a81..20e73409ae 100755 --- a/configure +++ b/configure @@ -691,7 +691,6 @@ base_machine add_on_subdirs add_ons libc_cv_nss_crypt -experimental_malloc all_warnings force_install bindnow @@ -790,7 +789,6 @@ enable_force_install enable_kernel enable_all_warnings enable_multi_arch -enable_experimental_malloc enable_nss_crypt with_cpu ' @@ -1450,8 +1448,6 @@ Optional Features: --enable-all-warnings enable all useful warnings gcc can issue --enable-multi-arch enable single DSO with optimizations for multiple architectures - --enable-experimental-malloc - enable experimental malloc features --enable-nss-crypt enable libcrypt to use nss Optional Packages: @@ -3766,13 +3762,6 @@ else fi -# Check whether --enable-experimental-malloc was given. -if test "${enable_experimental_malloc+set}" = set; then : - enableval=$enable_experimental_malloc; experimental_malloc=$enableval -fi - - - # Check whether --enable-nss-crypt was given. if test "${enable_nss_crypt+set}" = set; then : enableval=$enable_nss_crypt; nss_crypt=$enableval diff --git a/configure.in b/configure.in index fc2a193321..f2b3921df0 100644 --- a/configure.in +++ b/configure.in @@ -274,13 +274,6 @@ AC_ARG_ENABLE([multi-arch], [multi_arch=$enableval], [multi_arch=default]) -AC_ARG_ENABLE([experimental-malloc], - AC_HELP_STRING([--enable-experimental-malloc], - [enable experimental malloc features]), - [experimental_malloc=$enableval], - []) -AC_SUBST(experimental_malloc) - AC_ARG_ENABLE([nss-crypt], AC_HELP_STRING([--enable-nss-crypt], [enable libcrypt to use nss]), diff --git a/malloc/Makefile b/malloc/Makefile index e7ec1abf93..39be7c3e24 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009 +# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2011 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -125,9 +125,7 @@ endif tst-mcheck-ENV = MALLOC_CHECK_=3 -ifeq ($(experimental-malloc),yes) CPPFLAGS-malloc.c += -DPER_THREAD -DATOMIC_FASTBINS -endif # Uncomment this for test releases. For public releases it is too expensive. #CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1 |