r2566 - in glibc-package/trunk/debian: . patches patches/amd64
Author: schizo
Date: 2007-09-16 18:43:16 +0000 (Sun, 16 Sep 2007)
New Revision: 2566
Added:
glibc-package/trunk/debian/patches/amd64/local-x86_64_bits_sigcontext.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* amd64/local-x86_64_bits_sigcontext.diff: use a copy of the generic header
for x86_64. closes: #442418.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-09-16 18:24:03 UTC (rev 2565)
+++ glibc-package/trunk/debian/changelog 2007-09-16 18:43:16 UTC (rev 2566)
@@ -1,11 +1,16 @@
glibc (2.6.1-5) UNRELEASED; urgency=low
+ [ Pierre Habouzit ]
* remove any/local-sysmacros.diff: sorry for bug #439859 but it makes gimp
(and presumably other software) FTBFS, it's too dispruptive.
Closes: #442427.
- -- Pierre Habouzit <madcoder@debian.org> Sun, 16 Sep 2007 20:17:02 +0200
+ [ Clint Adams ]
+ * amd64/local-x86_64_bits_sigcontext.diff: use a copy of the generic header
+ for x86_64. closes: #442418.
+ -- Clint Adams <schizo@debian.org> Sun, 16 Sep 2007 14:42:17 -0400
+
glibc (2.6.1-4) unstable; urgency=low
* Disable any/local-ipv6-lookup.diff as it is causing breakages.
Added: glibc-package/trunk/debian/patches/amd64/local-x86_64_bits_sigcontext.diff
===================================================================
--- glibc-package/trunk/debian/patches/amd64/local-x86_64_bits_sigcontext.diff (rev 0)
+++ glibc-package/trunk/debian/patches/amd64/local-x86_64_bits_sigcontext.diff 2007-09-16 18:43:16 UTC (rev 2566)
@@ -0,0 +1,167 @@
+Index: glibc-2.6.1/sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h
+===================================================================
+--- glibc-2.6.1.orig/sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h 2007-09-16 20:38:15.000000000 +0200
++++ glibc-2.6.1/sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h 2007-09-16 20:38:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2002 Free Software Foundation, Inc.
++/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -8,7 +8,7 @@
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+@@ -16,144 +16,14 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+-#ifndef _BITS_SIGCONTEXT_H
+-#define _BITS_SIGCONTEXT_H 1
+-
+ #if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H
+ # error "Never use <bits/sigcontext.h> directly; include <signal.h> instead."
+ #endif
+
+-#include <bits/wordsize.h>
+-
+-struct _fpreg
+-{
+- unsigned short significand[4];
+- unsigned short exponent;
+-};
+-
+-struct _fpxreg
+-{
+- unsigned short significand[4];
+- unsigned short exponent;
+- unsigned short padding[3];
+-};
+-
+-struct _xmmreg
+-{
+- __uint32_t element[4];
+-};
+-
+-
+-
+-#if __WORDSIZE == 32
+-
+-struct _fpstate
+-{
+- /* Regular FPU environment. */
+- __uint32_t cw;
+- __uint32_t sw;
+- __uint32_t tag;
+- __uint32_t ipoff;
+- __uint32_t cssel;
+- __uint32_t dataoff;
+- __uint32_t datasel;
+- struct _fpreg _st[8];
+- unsigned short status;
+- unsigned short magic;
+-
+- /* FXSR FPU environment. */
+- __uint32_t _fxsr_env[6];
+- __uint32_t mxcsr;
+- __uint32_t reserved;
+- struct _fpxreg _fxsr_st[8];
+- struct _xmmreg _xmm[8];
+- __uint32_t padding[56];
+-};
+-
+ #ifndef sigcontext_struct
+ /* Kernel headers before 2.1.1 define a struct sigcontext_struct, but
+- we need sigcontext. Some packages have come to rely on
+- sigcontext_struct being defined on 32-bit x86, so define this for
+- their benefit. */
++ we need sigcontext. */
+ # define sigcontext_struct sigcontext
+-#endif
+-
+-struct sigcontext
+-{
+- unsigned short gs, __gsh;
+- unsigned short fs, __fsh;
+- unsigned short es, __esh;
+- unsigned short ds, __dsh;
+- unsigned long edi;
+- unsigned long esi;
+- unsigned long ebp;
+- unsigned long esp;
+- unsigned long ebx;
+- unsigned long edx;
+- unsigned long ecx;
+- unsigned long eax;
+- unsigned long trapno;
+- unsigned long err;
+- unsigned long eip;
+- unsigned short cs, __csh;
+- unsigned long eflags;
+- unsigned long esp_at_signal;
+- unsigned short ss, __ssh;
+- struct _fpstate * fpstate;
+- unsigned long oldmask;
+- unsigned long cr2;
+-};
+-
+-#else /* __WORDSIZE == 64 */
+-
+-struct _fpstate
+-{
+- /* FPU environment matching the 64-bit FXSAVE layout. */
+- __uint16_t cwd;
+- __uint16_t swd;
+- __uint16_t ftw;
+- __uint16_t fop;
+- __uint64_t rip;
+- __uint64_t rdp;
+- __uint32_t mxcsr;
+- __uint32_t mxcr_mask;
+- struct _fpxreg _st[8];
+- struct _xmmreg _xmm[16];
+- __uint32_t padding[24];
+-};
+-
+-struct sigcontext
+-{
+- unsigned long r8;
+- unsigned long r9;
+- unsigned long r10;
+- unsigned long r11;
+- unsigned long r12;
+- unsigned long r13;
+- unsigned long r14;
+- unsigned long r15;
+- unsigned long rdi;
+- unsigned long rsi;
+- unsigned long rbp;
+- unsigned long rbx;
+- unsigned long rdx;
+- unsigned long rax;
+- unsigned long rcx;
+- unsigned long rsp;
+- unsigned long rip;
+- unsigned long eflags;
+- unsigned short cs;
+- unsigned short gs;
+- unsigned short fs;
+- unsigned short __pad0;
+- unsigned long err;
+- unsigned long trapno;
+- unsigned long oldmask;
+- unsigned long cr2;
+- struct _fpstate * fpstate;
+- unsigned long __reserved1 [8];
+-};
+
+-#endif /* __WORDSIZE == 64 */
+-
+-#endif /* _BITS_SIGCONTEXT_H */
++# include <asm/sigcontext.h>
++#endif
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-09-16 18:24:03 UTC (rev 2565)
+++ glibc-package/trunk/debian/patches/series 2007-09-16 18:43:16 UTC (rev 2566)
@@ -40,6 +40,7 @@
amd64/local-biarch.diff
amd64/local-linuxthreads-gscope.diff -p0
+amd64/local-x86_64_bits_sigcontext.diff
arm/cvs-gcc4-inline.diff -p0
arm/local-ioperm.diff -p0
Reply to: