From 67cbf9a2a9e8953aa7ea875938d6646727c71aaa Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 7 Dec 2012 14:55:19 -0700 Subject: [PATCH] [BZ #14898] * include/link.h (FORCED_DYNAMIC_TLS_OFFSET) [NO_TLS_OFFSET == 0]: Change to -1. --- ChangeLog | 6 ++++++ NEWS | 2 +- include/link.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92b027a375..80c873c436 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-12-07 Andreas Schwab + + [BZ #14898] + * include/link.h (FORCED_DYNAMIC_TLS_OFFSET) [NO_TLS_OFFSET == 0]: + Change to -1. + 2012-12-07 David S. Miller * po/libc.pot: Update. diff --git a/NEWS b/NEWS index 9b5cac90f9..756019a9a7 100644 --- 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 f0c8ad521f..d7590640aa 100644 --- 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 -- 2.11.4.GIT