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.16-ports-merge-614-ge10bb10
- From: tschwinge at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 Nov 2012 20:53:19 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-614-ge10bb10
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 e10bb1072cf11e52aad85d59673da86aeafd1b47 (commit)
from a0c2940d67e59b2f19515e2ac7280a7be9629ffa (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e10bb1072cf11e52aad85d59673da86aeafd1b47
commit e10bb1072cf11e52aad85d59673da86aeafd1b47
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Sun Nov 4 21:46:30 2012 +0100
[BZ #5246] Conditionalize use of PTR_DEMANGLE.
diff --git a/ChangeLog b/ChangeLog
index 9b5b8f7..594a7d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-11-04 Thomas Schwinge <thomas@codesourcery.com>
+
+ * csu/libc-start.c (LIBC_START_MAIN): Conditionalize use of
+ PTR_DEMANGLE.
+
+ [BZ #5246]
+ * sysdeps/mach/hurd/i386/____longjmp_chk.S: Conditionalize use of
+ PTR_DEMANGLE.
+
2012-11-04 Joseph Myers <joseph@codesourcery.com>
[BZ #14797]
diff --git a/NEWS b/NEWS
index a6d757f..41f4574 100644
--- a/NEWS
+++ b/NEWS
@@ -9,16 +9,16 @@ Version 2.17
* The following bugs are resolved with this release:
- 1349, 3439, 3479, 5044, 5298, 5400, 6530, 6778, 6808, 9685, 9914, 10014,
- 10038, 10631, 11438, 11607, 11638, 12140, 13412, 13542, 13601, 13629,
- 13679, 13696, 13717, 13741, 13939, 13966, 14042, 14047, 14090, 14150,
- 14151, 14152, 14154, 14157, 14166, 14173, 14195, 14237, 14251, 14252,
- 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349,
- 14376, 14417, 14459, 14476, 14477, 14505, 14510, 14516, 14518, 14519,
- 14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576,
- 14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648,
- 14652, 14660, 14661, 14669, 14683, 14694, 14716, 14743, 14767, 14783,
- 14784, 14785, 14796, 14797.
+ 1349, 3439, 3479, 5044, 5246, 5298, 5400, 6530, 6778, 6808, 9685, 9914,
+ 10014, 10038, 10631, 11438, 11607, 11638, 12140, 13412, 13542, 13601,
+ 13629, 13679, 13696, 13717, 13741, 13939, 13966, 14042, 14047, 14090,
+ 14150, 14151, 14152, 14154, 14157, 14166, 14173, 14195, 14237, 14251,
+ 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347,
+ 14349, 14376, 14417, 14459, 14476, 14477, 14505, 14510, 14516, 14518,
+ 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568,
+ 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645,
+ 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716, 14743, 14767,
+ 14783, 14784, 14785, 14796, 14797.
* Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and
diff --git a/csu/libc-start.c b/csu/libc-start.c
index e335b64..e890535 100644
--- a/csu/libc-start.c
+++ b/csu/libc-start.c
@@ -272,7 +272,9 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
result = 0;
# ifdef SHARED
unsigned int *ptr = __libc_pthread_functions.ptr_nthreads;
+# ifdef PTR_DEMANGLE
PTR_DEMANGLE (ptr);
+# endif
# else
extern unsigned int __nptl_nthreads __attribute ((weak));
unsigned int *const ptr = &__nptl_nthreads;
diff --git a/sysdeps/mach/hurd/i386/____longjmp_chk.S b/sysdeps/mach/hurd/i386/____longjmp_chk.S
index f499fbd..39282d3 100644
--- a/sysdeps/mach/hurd/i386/____longjmp_chk.S
+++ b/sysdeps/mach/hurd/i386/____longjmp_chk.S
@@ -52,8 +52,10 @@ ENTRY (____longjmp_chk)
/* Get the stack pointer. */
movl (JB_SP*4)(%ecx), %edi
cfi_undefined(%edi)
+#ifdef PTR_DEMANGLE
PTR_DEMANGLE (%edx)
PTR_DEMANGLE (%edi)
+#endif
cmpl %edi, %esp
/* Jumping to a higher-address frame is always allowed. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
NEWS | 20 ++++++++++----------
csu/libc-start.c | 2 ++
sysdeps/mach/hurd/i386/____longjmp_chk.S | 2 ++
4 files changed, 23 insertions(+), 10 deletions(-)
hooks/post-receive
--
GNU C Library master sources