OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ia64: add __ prefix to pt_all_user_regs/ia64_fpreg [BZ #762] 

This addresses a long standing collision between userspace headers and
kernel headers only on ia64 systems.  All other types have a __ prefix
in the ptrace headers except these two.  Let's finally namespace these.

Verified that at least strace still builds after this change, as well
as after deleting all the struct hacks it has specifically for ia64.

URL: https://sourceware.org/bugzilla/show_bug.cgi?id=762
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2014-01-05 16:23:42 -05:00
parent 9341dde4d5
commit c8c9ab8b88
5 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
NEWS
View File

@ -9,22 +9,22 @@ Version 2.19
* The following bugs are resolved with this release:
156, 387, 431, 832, 926, 2801, 4772, 6786, 6787, 6807, 6810, 7003, 9954,
10253, 10278, 11087, 11157, 11214, 12100, 12486, 12986, 13028, 13982,
13985, 14029, 14032, 14120, 14143, 14155, 14547, 14699, 14752, 14876,
14910, 15004, 15048, 15073, 15089, 15128, 15218, 15268, 15277, 15308,
15362, 15374, 15400, 15425, 15427, 15483, 15522, 15531, 15532, 15593,
15601, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680, 15681,
15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15763, 15764,
15797, 15799, 15825, 15843, 15844, 15846, 15847, 15849, 15855, 15856,
15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897,
15901, 15905, 15909, 15915, 15917, 15919, 15921, 15923, 15939, 15941,
15948, 15963, 15966, 15985, 15988, 15997, 16032, 16034, 16036, 16037,
16038, 16041, 16055, 16071, 16072, 16074, 16077, 16078, 16103, 16112,
16143, 16144, 16146, 16150, 16151, 16153, 16167, 16172, 16195, 16214,
16245, 16271, 16274, 16283, 16289, 16293, 16314, 16316, 16330, 16337,
16338, 16356, 16365, 16366, 16369, 16372, 16375, 16379, 16384, 16385,
16386, 16390.
156, 387, 431, 762, 832, 926, 2801, 4772, 6786, 6787, 6807, 6810, 7003,
9954, 10253, 10278, 11087, 11157, 11214, 12100, 12486, 12986, 13028,
13982, 13985, 14029, 14032, 14120, 14143, 14155, 14547, 14699, 14752,
14876, 14910, 15004, 15048, 15073, 15089, 15128, 15218, 15268, 15277,
15308, 15362, 15374, 15400, 15425, 15427, 15483, 15522, 15531, 15532,
15593, 15601, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680,
15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15763,
15764, 15797, 15799, 15825, 15843, 15844, 15846, 15847, 15849, 15855,
15856, 15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895,
15897, 15901, 15905, 15909, 15915, 15917, 15919, 15921, 15923, 15939,
15941, 15948, 15963, 15966, 15985, 15988, 15997, 16032, 16034, 16036,
16037, 16038, 16041, 16055, 16071, 16072, 16074, 16077, 16078, 16103,
16112, 16143, 16144, 16146, 16150, 16151, 16153, 16167, 16172, 16195,
16214, 16245, 16271, 16274, 16283, 16289, 16293, 16314, 16316, 16330,
16337, 16338, 16356, 16365, 16366, 16369, 16372, 16375, 16379, 16384,
16385, 16386, 16390.
* Slovenian translations for glibc messages have been contributed by the
Translation Project's Slovenian team of translators.

13
ports/ChangeLog.ia64
View File

@ -1,3 +1,16 @@
2014-01-06 Mike Frysinger <vapier@gentoo.org>
[BZ #762]
* sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h (ia64_fpreg):
Rename to ...
(__ia64_fpreg): ... this.
(sigcontext): Use __ia64_fpreg.
* sysdeps/unix/sysv/linux/ia64/sys/procfs.h (elf_fpreg_t): Use
__ia64_fpreg.
* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (pt_all_user_regs):
Rename to ...
(__pt_all_user_regs): ... this. Use __ia64_fpreg.
2014-01-06 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (ptrace_peeksiginfo_args):

4
ports/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
View File

@ -27,7 +27,7 @@
#include <stddef.h>
#include <bits/sigstack.h>
struct ia64_fpreg
struct __ia64_fpreg
{
union
{
@ -55,7 +55,7 @@ struct sigcontext
unsigned long int sc_pr; /* predicate registers */
unsigned long int sc_br[8]; /* branch registers */
unsigned long int sc_gr[32]; /* general registers (static partition) */
struct ia64_fpreg sc_fr[128]; /* floating-point registers */
struct __ia64_fpreg sc_fr[128]; /* floating-point registers */
unsigned long int sc_rbs_base;/* NULL or new base of sighandler's rbs */
unsigned long int sc_loadrs; /* see description above */
unsigned long int sc_ar25; /* cmp8xchg16 uses this */

2
ports/sysdeps/unix/sysv/linux/ia64/sys/procfs.h
View File

@ -46,7 +46,7 @@ struct elf_siginfo
typedef unsigned long elf_greg_t;
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
typedef struct ia64_fpreg elf_fpreg_t;
typedef struct __ia64_fpreg elf_fpreg_t;
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
typedef elf_greg_t greg_t;

4
ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
View File

@ -144,7 +144,7 @@ enum __ptrace_flags
};
/* pt_all_user_regs is used for PTRACE_GETREGS/PTRACE_SETREGS. */
struct pt_all_user_regs
struct __pt_all_user_regs
{
unsigned long nat;
unsigned long cr_iip;
@ -155,7 +155,7 @@ struct pt_all_user_regs
unsigned long gr[32];
unsigned long br[8];
unsigned long ar[128];
struct ia64_fpreg fr[128];
struct __ia64_fpreg fr[128];
};
/* Options set using PTRACE_SETOPTIONS. */