[BZ #14898]

	* include/link.h (FORCED_DYNAMIC_TLS_OFFSET) [NO_TLS_OFFSET == 0]:
	Change to -1.

diff --git a/ChangeLog b/ChangeLog
index 92b027a3756b7771fef64d360ec4208f7fb3be9d..80c873c43670df8f57dbcbf6d7e00a2f2f60953a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+       [BZ #14898]
+       * include/link.h (FORCED_DYNAMIC_TLS_OFFSET) [NO_TLS_OFFSET == 0]:
+       Change to -1.
+
 2012-12-07  David S. Miller  <davem@davemloft.net>
 
        * po/libc.pot: Update.

diff --git a/NEWS b/NEWS
index 9b5cac90f9d0c25b1bb258ce8728a364e71b1732..756019a9a73012d6078f97350dd5a4f656c98678 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,7 +22,7 @@ Version 2.17
   14661, 14669, 14672, 14683, 14694, 14716, 14719, 14743, 14767, 14783,
   14784, 14785, 14793, 14796, 14797, 14801, 14803, 14805, 14807, 14811,
   14815, 14821, 14822, 14824, 14828, 14831, 14835, 14838, 14856, 14863,
-  14865, 14866, 14868, 14869, 14871, 14879, 14889, 14893, 14914.
+  14865, 14866, 14868, 14869, 14871, 14879, 14889, 14893, 14898, 14914.
 
 * CVE-2011-4609 svc_run() produces high cpu usage when accept fails with
   EMFILE has been fixed (Bugzilla #14889).

diff --git a/include/link.h b/include/link.h
index f0c8ad521f99d30a9b481427e6282482d47bcfba..d7590640aa9285e52abf95d4528f74d6cf897cce 100644 (file)
--- a/include/link.h
+++ b/include/link.h
@@ -289,7 +289,7 @@ struct link_map
 #endif
 #ifndef FORCED_DYNAMIC_TLS_OFFSET
 # if NO_TLS_OFFSET == 0
-#  define FORCED_DYNAMIC_TLS_OFFSET 1
+#  define FORCED_DYNAMIC_TLS_OFFSET -1
 # elif NO_TLS_OFFSET == -1
 #  define FORCED_DYNAMIC_TLS_OFFSET -2
 # else