r2938 - in glibc-package/trunk/debian: . patches patches/alpha
Author: aurel32
Date: 2008-05-11 13:19:06 +0000 (Sun, 11 May 2008)
New Revision: 2938
Added:
glibc-package/trunk/debian/patches/alpha/submitted-procfs_h.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/alpha/submitted-procfs_h.diff: don't include elf/asm.h on alpha,
as it has been removed from linux-libc-dev.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-05-11 12:04:29 UTC (rev 2937)
+++ glibc-package/trunk/debian/changelog 2008-05-11 13:19:06 UTC (rev 2938)
@@ -1,6 +1,7 @@
glibc (2.7-12) UNRELEASED; urgency=low
- *
+ * patches/alpha/submitted-procfs_h.diff: don't include elf/asm.h on alpha,
+ as it has been removed from linux-libc-dev.
-- Aurelien Jarno <aurel32@debian.org> Sun, 11 May 2008 14:04:13 +0200
Added: glibc-package/trunk/debian/patches/alpha/submitted-procfs_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/submitted-procfs_h.diff (rev 0)
+++ glibc-package/trunk/debian/patches/alpha/submitted-procfs_h.diff 2008-05-11 13:19:06 UTC (rev 2938)
@@ -0,0 +1,33 @@
+2008-05-11 Aurelien Jarno <aurelien@aurel32.net
+
+ * sysdeps/unix/sysv/linux/alpha/sys/procfs.h (ELF_NGREG,
+ ELF_NFPREG, elf_greg_t, elf_gregset_t, elf_fpreg_t,
+ elf_fpregset_t): Define. Don't include asm/elf.h.
+
+--- a/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
++++ b/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
+@@ -29,10 +29,23 @@
+ #include <sys/types.h>
+ #include <sys/ucontext.h>
+ #include <sys/user.h>
+-#include <asm/elf.h>
+
+ __BEGIN_DECLS
+
++/*
++ * The OSF/1 version of <sys/procfs.h> makes gregset_t 46 entries long.
++ * I have no idea why that is so. For now, we just leave it at 33
++ * (32 general regs + processor status word).
++ */
++#define ELF_NGREG 33
++#define ELF_NFPREG 32
++
++typedef unsigned long elf_greg_t;
++typedef elf_greg_t elf_gregset_t[ELF_NGREG];
++
++typedef double elf_fpreg_t;
++typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
++
+ struct elf_siginfo
+ {
+ int si_signo; /* Signal number. */
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-05-11 12:04:29 UTC (rev 2937)
+++ glibc-package/trunk/debian/patches/series 2008-05-11 13:19:06 UTC (rev 2938)
@@ -47,6 +47,7 @@
alpha/submitted-fpu-round.diff -p0
alpha/submitted-xstat.diff -p0
alpha/submitted-PTR_MANGLE.diff
+alpha/submitted-procfs_h.diff -p1
amd64/cvs-vdso_clock_gettime.diff -p1
amd64/local-biarch.diff
Reply to: