diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2014-01-05 16:23:42 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-06 08:11:35 -0500 |
| commit | c8c9ab8b881e9d8676f60259611adbd07e986ca2 (patch) | |
| tree | 9f5ae53a78b9c04469a9f120a67aa11083056561 /ports | |
| parent | 9341dde4d56ca71b61b47c8b87a06e6d5813ed0e (diff) | |
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>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ChangeLog.ia64 | 13 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h | 4 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/ia64/sys/procfs.h | 2 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h | 4 |
4 files changed, 18 insertions, 5 deletions
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64 index a9d5039745..28b5ebc55c 100644 --- a/ports/ChangeLog.ia64 +++ b/ports/ChangeLog.ia64 @@ -1,5 +1,18 @@ 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): Rename to ... (__ptrace_peeksiginfo_args): ... this. diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h index 93d421aff7..d11c1f17f6 100644 --- a/ports/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h +++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h @@ -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 */ diff --git a/ports/sysdeps/unix/sysv/linux/ia64/sys/procfs.h b/ports/sysdeps/unix/sysv/linux/ia64/sys/procfs.h index fac96c3d47..0c431fbfcf 100644 --- a/ports/sysdeps/unix/sysv/linux/ia64/sys/procfs.h +++ b/ports/sysdeps/unix/sysv/linux/ia64/sys/procfs.h @@ -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; diff --git a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h index 801a549eca..f67798a99b 100644 --- a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h +++ b/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h @@ -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. */ |