1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00

[BZ #5246] Conditionalize use of PTR_DEMANGLE.

This commit is contained in:
Thomas Schwinge
2012-11-04 21:46:30 +01:00
parent a0c2940d67
commit e10bb1072c
4 changed files with 23 additions and 10 deletions

View File

@@ -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> 2012-11-04 Joseph Myers <joseph@codesourcery.com>
[BZ #14797] [BZ #14797]

20
NEWS
View File

@@ -9,16 +9,16 @@ Version 2.17
* The following bugs are resolved with this release: * The following bugs are resolved with this release:
1349, 3439, 3479, 5044, 5298, 5400, 6530, 6778, 6808, 9685, 9914, 10014, 1349, 3439, 3479, 5044, 5246, 5298, 5400, 6530, 6778, 6808, 9685, 9914,
10038, 10631, 11438, 11607, 11638, 12140, 13412, 13542, 13601, 13629, 10014, 10038, 10631, 11438, 11607, 11638, 12140, 13412, 13542, 13601,
13679, 13696, 13717, 13741, 13939, 13966, 14042, 14047, 14090, 14150, 13629, 13679, 13696, 13717, 13741, 13939, 13966, 14042, 14047, 14090,
14151, 14152, 14154, 14157, 14166, 14173, 14195, 14237, 14251, 14252, 14150, 14151, 14152, 14154, 14157, 14166, 14173, 14195, 14237, 14251,
14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347,
14376, 14417, 14459, 14476, 14477, 14505, 14510, 14516, 14518, 14519, 14349, 14376, 14417, 14459, 14476, 14477, 14505, 14510, 14516, 14518,
14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576, 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568,
14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645,
14652, 14660, 14661, 14669, 14683, 14694, 14716, 14743, 14767, 14783, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716, 14743, 14767,
14784, 14785, 14796, 14797. 14783, 14784, 14785, 14796, 14797.
* Support for STT_GNU_IFUNC symbols added for s390 and s390x. * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and Optimized versions of memcpy, memset, and memcmp added for System z10 and

View File

@@ -272,7 +272,9 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
result = 0; result = 0;
# ifdef SHARED # ifdef SHARED
unsigned int *ptr = __libc_pthread_functions.ptr_nthreads; unsigned int *ptr = __libc_pthread_functions.ptr_nthreads;
# ifdef PTR_DEMANGLE
PTR_DEMANGLE (ptr); PTR_DEMANGLE (ptr);
# endif
# else # else
extern unsigned int __nptl_nthreads __attribute ((weak)); extern unsigned int __nptl_nthreads __attribute ((weak));
unsigned int *const ptr = &__nptl_nthreads; unsigned int *const ptr = &__nptl_nthreads;

View File

@@ -52,8 +52,10 @@ ENTRY (____longjmp_chk)
/* Get the stack pointer. */ /* Get the stack pointer. */
movl (JB_SP*4)(%ecx), %edi movl (JB_SP*4)(%ecx), %edi
cfi_undefined(%edi) cfi_undefined(%edi)
#ifdef PTR_DEMANGLE
PTR_DEMANGLE (%edx) PTR_DEMANGLE (%edx)
PTR_DEMANGLE (%edi) PTR_DEMANGLE (%edi)
#endif
cmpl %edi, %esp cmpl %edi, %esp
/* Jumping to a higher-address frame is always allowed. */ /* Jumping to a higher-address frame is always allowed. */