about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2013-07-04 20:33:03 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-07-04 20:33:03 +0530
commit52dfbe137e41f2da1f5584f6dd9ea89589c71228 (patch)
treeefed78bd12e34d5c0eef9013a03ea11f9601a8d7
parent3f16954315aa4da11eb33306395d28913b11fc32 (diff)
downloadglibc-52dfbe137e41f2da1f5584f6dd9ea89589c71228.tar.gz
glibc-52dfbe137e41f2da1f5584f6dd9ea89589c71228.tar.xz
glibc-52dfbe137e41f2da1f5584f6dd9ea89589c71228.zip
Fix lock elision help text in INSTALL and configure
-rw-r--r--ChangeLog6
-rw-r--r--INSTALL2
-rwxr-xr-xconfigure3
-rw-r--r--configure.in2
4 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 68fe840073..62f5fe0e7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-04  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* configure.in (--enable-lock-elision): Fix message text.
+	* INSTALL: Regenerate.
+	* configure: Regenerate.
+
 2013-07-04  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/fpu/libm-test-ulps: Update.
diff --git a/INSTALL b/INSTALL
index f1b498a14e..721a7fc10c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -134,7 +134,7 @@ will be used, and CFLAGS sets optimization options for the compiler.
      dynamic tests so that they can be invoked directly.
 
 `--enable-lock-elision=yes'
-     Enable lock elision for pthread mutexes and rwlocks by default.
+     Enable lock elision for pthread mutexes by default.
 
 `--build=BUILD-SYSTEM'
 `--host=HOST-SYSTEM'
diff --git a/configure b/configure
index a873b20617..59a69f634f 100755
--- a/configure
+++ b/configure
@@ -1401,8 +1401,7 @@ Optional Features:
                           initialize __stack_chk_guard canary with a random
                           number at program start
   --enable-lock-elision=yes/no
-                          Enable lock elision for pthread mutexes and rwlocks
-                          by default
+                          Enable lock elision for pthread mutexes by default
   --enable-add-ons[=DIRS...]
                           configure and build add-ons in DIR1,DIR2,... search
                           for add-ons if no parameter given
diff --git a/configure.in b/configure.in
index cf118f8ffa..4db1acf115 100644
--- a/configure.in
+++ b/configure.in
@@ -186,7 +186,7 @@ fi
 
 AC_ARG_ENABLE([lock-elision],
 	      AC_HELP_STRING([--enable-lock-elision[=yes/no]],
-			     [Enable lock elision for pthread mutexes and rwlocks by default]),
+			     [Enable lock elision for pthread mutexes by default]),
 	      [enable_lock_elision=$enableval],
 	      [enable_lock_elision=no])
 if test "$enable_lock_elision" = yes ; then