From: DJ Delorie <dj@delorie.com>
Date: Wed, 11 Jan 2017 20:09:55 +0000 (-0500)
Subject: Merge branch 'master' into dj/malloc-tcache
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4250ac7f60baa1977ea646610e35a2368ce6a56a;p=thirdparty%2Fglibc.git

Merge branch 'master' into dj/malloc-tcache
---

4250ac7f60baa1977ea646610e35a2368ce6a56a
diff --cc config.make.in
index 86717fea07e,5836b32a720..0290d834692
--- a/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 de224a9b444,eecd0ace740..b80fd4d68b0
--- a/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 malloc/Makefile
index 94a96613ea4,e93b83b57d9..dd8a43a6c77
--- a/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