about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--INSTALL6
-rw-r--r--manual/install.texi6
3 files changed, 5 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index be1e0bb759..84738f52ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-05  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* manual/install.texi: Remove mention of --without-tls
+	* INSTALL: Regenerate.
+
 2016-06-05  Florian Weimer  <fweimer@redhat.com>
 
 	* dlfcn/tst-rec-dlopen.c (custom_malloc_hook, old_malloc_hook):
diff --git a/INSTALL b/INSTALL
index 31e256d413..ec3445f2d6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -116,12 +116,6 @@ will be used, and CFLAGS sets optimization options for the compiler.
      program linked statically with the NSS libraries cannot be
      dynamically reconfigured to use a different name database.
 
-'--without-tls'
-     By default the C library is built with support for thread-local
-     storage if the used tools support it.  By using '--without-tls'
-     this can be prevented though there generally is no reason since it
-     creates compatibility problems.
-
 '--enable-hardcoded-path-in-tests'
      By default, dynamic tests are linked to run with the installed C
      library.  This option hardcodes the newly built C library path in
diff --git a/manual/install.texi b/manual/install.texi
index 95021b4a50..79ee45fcdb 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -146,12 +146,6 @@ This is not recommended because it defeats the purpose of NSS; a program
 linked statically with the NSS libraries cannot be dynamically
 reconfigured to use a different name database.
 
-@item --without-tls
-By default the C library is built with support for thread-local storage
-if the used tools support it.  By using @samp{--without-tls} this can be
-prevented though there generally is no reason since it creates
-compatibility problems.
-
 @item --enable-hardcoded-path-in-tests
 By default, dynamic tests are linked to run with the installed C library.
 This option hardcodes the newly built C library path in dynamic tests