Author: aurel32
Date: 2011-12-21 03:03:01 +0000 (Wed, 21 Dec 2011)
New Revision: 5104
Added:
glibc-package/trunk/debian/patches/arm/cvs-ucontext.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/arm/cvs-ucontext.diff: fix namespace pollution from
<sys/ucontext.h> on arm. Closes: #652844.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-12-21 02:56:44 UTC (rev
5103)
+++ glibc-package/trunk/debian/changelog 2011-12-21 03:03:01 UTC (rev
5104)
@@ -14,6 +14,8 @@
* patches/hurd/tg-struct_stat.diff: fix #ifdef typos.
* kfreebsd/local-sysdeps.diff: update to revision 3952 (from glibc-bsd).
* patches/m68k/local-pthread_lock.diff: remove, obsolete.
+ * patches/arm/cvs-ucontext.diff: fix namespace pollution from
+ <sys/ucontext.h> on arm. Closes: #652844.
-- Aurelien Jarno <[email protected]> Wed, 14 Dec 2011 00:42:25 +0100
Added: glibc-package/trunk/debian/patches/arm/cvs-ucontext.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/cvs-ucontext.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/arm/cvs-ucontext.diff 2011-12-21
03:03:01 UTC (rev 5104)
@@ -0,0 +1,135 @@
+2011-12-20 Peter Green <[email protected]>
+
+ * sysdeps/unix/sysv/linux/arm/sys/ucontext.h: Don't include
+ <sys/procfs.h>.
+ (gregset_t): Define without using elf_gregset_t.
+ (R0): Rename to REG_R0.
+ (R1): Rename to REG_R1.
+ (R2): Rename to REG_R2.
+ (R3): Rename to REG_R3.
+ (R4): Rename to REG_R4.
+ (R5): Rename to REG_R5.
+ (R6): Rename to REG_R6.
+ (R7): Rename to REG_R7.
+ (R8): Rename to REG_R8.
+ (R9): Rename to REG_R9.
+ (R10): Rename to REG_R10.
+ (R11): Rename to REG_R11.
+ (R12): Rename to REG_R12.
+ (R13): Rename to REG_R13.
+ (R14): Rename to REG_R14.
+ (R15): Rename to REG_R15.
+ (struct _libc_fpstate): New.
+ (fpregset_t): Define using struct _libc_fpstate.
+
+diff --git a/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
b/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
+index 9ecff7b..58f438c 100644
+--- a/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
++++ b/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
+@@ -23,7 +23,6 @@
+
+ #include <features.h>
+ #include <signal.h>
+-#include <sys/procfs.h>
+
+ /* We need the signal context definitions even if they are not used
+ included in <signal.h>. */
+@@ -35,47 +34,64 @@ typedef int greg_t;
+ #define NGREG 18
+
+ /* Container for all general registers. */
+-typedef elf_gregset_t gregset_t;
++typedef greg_t gregset_t[NGREG];
+
+ /* Number of each register is the `gregset_t' array. */
+ enum
+ {
+- R0 = 0,
+-#define R0 R0
+- R1 = 1,
+-#define R1 R1
+- R2 = 2,
+-#define R2 R2
+- R3 = 3,
+-#define R3 R3
+- R4 = 4,
+-#define R4 R4
+- R5 = 5,
+-#define R5 R5
+- R6 = 6,
+-#define R6 R6
+- R7 = 7,
+-#define R7 R7
+- R8 = 8,
+-#define R8 R8
+- R9 = 9,
+-#define R9 R9
+- R10 = 10,
+-#define R10 R10
+- R11 = 11,
+-#define R11 R11
+- R12 = 12,
+-#define R12 R12
+- R13 = 13,
+-#define R13 R13
+- R14 = 14,
+-#define R14 R14
+- R15 = 15
+-#define R15 R15
++ REG_R0 = 0,
++#define REG_R0 REG_R0
++ REG_R1 = 1,
++#define REG_R1 REG_R1
++ REG_R2 = 2,
++#define REG_R2 REG_R2
++ REG_R3 = 3,
++#define REG_R3 REG_R3
++ REG_R4 = 4,
++#define REG_R4 REG_R4
++ REG_R5 = 5,
++#define REG_R5 REG_R5
++ REG_R6 = 6,
++#define REG_R6 REG_R6
++ REG_R7 = 7,
++#define REG_R7 REG_R7
++ REG_R8 = 8,
++#define REG_R8 REG_R8
++ REG_R9 = 9,
++#define REG_R9 REG_R9
++ REG_R10 = 10,
++#define REG_R10 REG_R10
++ REG_R11 = 11,
++#define REG_R11 REG_R11
++ REG_R12 = 12,
++#define REG_R12 REG_R12
++ REG_R13 = 13,
++#define REG_R13 REG_R13
++ REG_R14 = 14,
++#define REG_R14 REG_R14
++ REG_R15 = 15
++#define REG_R15 REG_R15
+ };
+
++struct _libc_fpstate
++{
++ struct
++ {
++ unsigned int sign1:1;
++ unsigned int unused:15;
++ unsigned int sign2:1;
++ unsigned int exponent:14;
++ unsigned int j:1;
++ unsigned int mantissa1:31;
++ unsigned int mantissa0:32;
++ } fpregs[8];
++ unsigned int fpsr:32;
++ unsigned int fpcr:32;
++ unsigned char ftype[8];
++ unsigned int init_flag;
++};
+ /* Structure to describe FPU registers. */
+-typedef elf_fpregset_t fpregset_t;
++typedef struct _libc_fpstate fpregset_t;
+
+ /* Context to describe whole processor state. This only describes
+ the core registers; coprocessor registers get saved elsewhere
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-12-21 02:56:44 UTC (rev
5103)
+++ glibc-package/trunk/debian/patches/series 2011-12-21 03:03:01 UTC (rev
5104)
@@ -87,6 +87,7 @@
arm/unsubmitted-ldconfig-cache-abi.diff
arm/unsubmitted-ldso-abi-check.diff
arm/cvs-syscall-mcount.diff
+arm/cvs-ucontext.diff
hppa/local-inlining.diff
hppa/local-linuxthreads.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
