Merge branch 'master' into dj/malloc-tcache

diff --cc config.make.in
index 86717fea07ebe2d94172e3c9e960af1da4db7f82,5836b32a7203cc5daa50e35fb46d772f0c60590b..0290d834692cf21d7cba34baa5e4d312898d3be6
--- 1/config.make.in
--- 2/config.make.in
+++ b/config.make.in
@@@ -74,9 -77,8 +77,10 @@@ multi-arch = @multi_arch
  
  mach-interface-list = @mach_interface_list@
  
 +experimental-malloc = @experimental_malloc@
 +
  nss-crypt = @libc_cv_nss_crypt@
+ static-nss-crypt = @libc_cv_static_nss_crypt@
  
  # Configuration options.
  build-shared = @shared@

diff --cc configure
index de224a9b444755bbb58cc4c8b1e5ccd5816518a4,eecd0ace740e8fafcb01c0019bc592fe1469b609..b80fd4d68b04ec1ca6f99021ecfe68e5bb7eecff
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -665,8 -670,8 +670,9 @@@ have_tunable
  build_pt_chown
  build_nscd
  link_obsolete_rpc
+ libc_cv_static_nss_crypt
  libc_cv_nss_crypt
 +experimental_malloc
  enable_werror
  all_warnings
  force_install

diff --cc configure.ac
Simple merge

diff --cc malloc/Makefile
index 94a96613ea447a8adb3da0288eaf67638de7640a,e93b83b57d9cdf30f54f41e4b853d4df783ba331..dd8a43a6c770fa11d2d7250aebbcda983af58fc2
--- 1/malloc/Makefile
--- 2/malloc/Makefile
+++ b/malloc/Makefile
@@@ -158,10 -164,10 +164,13 @@@ endi
  
  tst-mcheck-ENV = MALLOC_CHECK_=3
  tst-malloc-usable-ENV = MALLOC_CHECK_=3
+ tst-malloc-usable-static-ENV = $(tst-malloc-usable-ENV)
+ tst-malloc-usable-tunables-ENV = GLIBC_TUNABLES=glibc.malloc.check=3
+ tst-malloc-usable-static-tunables-ENV = $(tst-malloc-usable-tunables-ENV)
  
 +ifeq ($(experimental-malloc),yes)
 +CPPFLAGS-malloc.c += -DUSE_TCACHE
 +endif
  # Uncomment this for test releases.  For public releases it is too expensive.
  #CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1
  

diff --cc malloc/malloc.c
Simple merge