Author: aurel32 Date: 2014-07-19 11:16:55 +0000 (Sat, 19 Jul 2014) New Revision: 6216
Added: glibc-package/trunk/debian/patches/arm64/cvs-includes-cleanup.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series Log: debian/patches/arm64/cvs-includes-cleanup.diff: new patch from upstream to clean sys/user.h and sys/procfs.h. Closes: #755169. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2014-07-16 18:43:31 UTC (rev 6215) +++ glibc-package/trunk/debian/changelog 2014-07-19 11:16:55 UTC (rev 6216) @@ -3,6 +3,10 @@ [ Helmut Grohne ] * debian/patches/build stage2 without selinux. Closes: #742640. + [ Aurelien Jarno ] + * debian/patches/arm64/cvs-includes-cleanup.diff: new patch from upstream to + clean sys/user.h and sys/procfs.h. Closes: #755169. + -- Adam Conrad <[email protected]> Sat, 12 Jul 2014 20:53:51 -0600 glibc (2.19-7) unstable; urgency=high Added: glibc-package/trunk/debian/patches/arm64/cvs-includes-cleanup.diff =================================================================== --- glibc-package/trunk/debian/patches/arm64/cvs-includes-cleanup.diff (rev 0) +++ glibc-package/trunk/debian/patches/arm64/cvs-includes-cleanup.diff 2014-07-19 11:16:55 UTC (rev 6216) @@ -0,0 +1,82 @@ +2014-05-20 Will Newton <[email protected]> + Yvan Roux <[email protected]> + + * ports/sysdeps/unix/sysv/linux/aarch64/sys/user.h: Remove unused + #include of asm/ptrace.h. + (PTRACE_GET_THREAD_AREA): Remove #undef. + (PTRACE_GETHBPREGS): Likewise. + (PTRACE_SETHBPREGS): Likewise. + (struct user_regs_struct): New structure. + (struct user_fpsimd_struct): New structure. + * ports/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h: Remove unused + #include of asm/ptrace.h and second #include of sys/user.h. + (PTRACE_GET_THREAD_AREA): Remove #undef. + (PTRACE_GETHBPREGS): Likewise. + (PTRACE_SETHBPREGS): Likewise. + (ELF_NGREG): Use new struct user_regs_struct. + (elf_fpregset_t): Use new struct user_fpsimd_struct. + +--- a/ports/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h ++++ b/ports/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h +@@ -33,17 +33,6 @@ + #include <sys/types.h> + #include <sys/user.h> + +-/* We need to see the definition of struct pt_regs but do not want the +- linux PTRACE_* defines since they conflict with the generic eglibc +- definitions in sys/ptrace.h Hence the undef's below. */ +-#include <asm/ptrace.h> +- +-#undef PTRACE_GET_THREAD_AREA +-#undef PTRACE_GETHBPREGS +-#undef PTRACE_SETHBPREGS +- +-#include <sys/user.h> +- + __BEGIN_DECLS + + /* Type for a general-purpose register. */ +@@ -53,11 +42,11 @@ typedef unsigned long elf_greg_t; + pt_regs' directly in the typedef, but tradition says that + the register set is an array, which does have some peculiar + semantics, so leave it that way. */ +-#define ELF_NGREG (sizeof (struct user_pt_regs) / sizeof(elf_greg_t)) ++#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t)) + typedef elf_greg_t elf_gregset_t[ELF_NGREG]; + + /* Register set for the floating-point registers. */ +-typedef struct user_fpsimd_state elf_fpregset_t; ++typedef struct user_fpsimd_struct elf_fpregset_t; + + /* Signal info. */ + struct elf_siginfo +--- a/ports/sysdeps/unix/sysv/linux/aarch64/sys/user.h ++++ b/ports/sysdeps/unix/sysv/linux/aarch64/sys/user.h +@@ -19,13 +19,19 @@ + #ifndef _SYS_USER_H + #define _SYS_USER_H 1 + +-/* We need to see the definition of struct pt_regs but do not want the +- linux PTRACE_* defines since they conflict with the generic glibc +- definitions in sys/ptrace.h Hence the undef's below. */ +-#include <asm/ptrace.h> +- +-#undef PTRACE_GET_THREAD_AREA +-#undef PTRACE_GETHBPREGS +-#undef PTRACE_SETHBPREGS ++struct user_regs_struct ++{ ++ unsigned long long regs[31]; ++ unsigned long long sp; ++ unsigned long long pc; ++ unsigned long long pstate; ++}; ++ ++struct user_fpsimd_struct ++{ ++ __uint128_t vregs[32]; ++ unsigned int fpsr; ++ unsigned int fpcr; ++}; + + #endif Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2014-07-16 18:43:31 UTC (rev 6215) +++ glibc-package/trunk/debian/patches/series 2014-07-19 11:16:55 UTC (rev 6216) @@ -60,6 +60,8 @@ arm/local-vfp-sysdeps.diff arm/unsubmitted-ldso-multilib.diff +arm64/cvs-includes-cleanup.diff + hppa/local-inlining.diff hppa/submitted-fadvise64_64.diff hppa/submitted-nptl-carlos.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
