This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-363-g978a41c
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 May 2014 14:40:01 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-363-g978a41c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 978a41c35738dbe4592edb7dcaa155fec31dab50 (commit)
from fe6588457a7b66c6cfcd6e51640453de59b8017b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=978a41c35738dbe4592edb7dcaa155fec31dab50
commit 978a41c35738dbe4592edb7dcaa155fec31dab50
Author: Andreas Schwab <schwab@suse.de>
Date: Tue May 6 11:55:24 2014 +0200
Don't use catomic functions in mcount (BZ #16912)
mcount cannot use catomic functions since it is called by
__libc_start_main before TLS is set up. This reverts the change made by
commit 8099361.
diff --git a/ChangeLog b/ChangeLog
index 64d9ed7..6ccf041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-06 Andreas Schwab <schwab@suse.de>
+
+ [BZ #16912]
+ * gmon/mcount.c (_MCOUNT_DECL): Use
+ atomic_compare_and_exchange_bool_acq instead of
+ catomic_compare_and_exchange_bool_acq.
+
2014-05-05 Roland McGrath <roland@hack.frob.com>
* elf/Makefile (others, install-bin): Remove pldd.
diff --git a/NEWS b/NEWS
index 1351c01..47c951b 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Version 2.20
16677, 16680, 16683, 16689, 16695, 16701, 16706, 16707, 16712, 16713,
16714, 16731, 16739, 16740, 16743, 16754, 16758, 16759, 16760, 16770,
16786, 16789, 16791, 16799, 16800, 16815, 16823, 16824, 16831, 16838,
- 16854, 16885, 16888, 16890.
+ 16854, 16885, 16888, 16890, 16912.
* The minimum Linux kernel version that this version of the GNU C Library
can be used with is 2.6.32.
diff --git a/gmon/mcount.c b/gmon/mcount.c
index 0c2acd2..9d4a1a5 100644
--- a/gmon/mcount.c
+++ b/gmon/mcount.c
@@ -69,8 +69,8 @@ _MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
* check that we are profiling
* and that we aren't recursively invoked.
*/
- if (catomic_compare_and_exchange_bool_acq (&p->state, GMON_PROF_BUSY,
- GMON_PROF_ON))
+ if (atomic_compare_and_exchange_bool_acq (&p->state, GMON_PROF_BUSY,
+ GMON_PROF_ON))
return;
/*
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
NEWS | 2 +-
gmon/mcount.c | 4 ++--
3 files changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources