r3558 - in glibc-package/trunk/debian: . patches patches/sh4
Author: aurel32
Date: 2009-06-14 14:36:57 +0000 (Sun, 14 Jun 2009)
New Revision: 3558
Added:
glibc-package/trunk/debian/patches/sh4/cvs-headers-update.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* sh4/cvs-headers-update.diff: new patch from upstream to fix build failure
on SH4. Closes: #532385.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-06-14 14:13:00 UTC (rev 3557)
+++ glibc-package/trunk/debian/changelog 2009-06-14 14:36:57 UTC (rev 3558)
@@ -4,6 +4,8 @@
Update expected testsuite results accordingly.
* any/cvs-broken-dns.diff: backport more parts from upstream.
* Update Italian debconf translation, by Luca Monducci. Closes: #531431.
+ * sh4/cvs-headers-update.diff: new patch from upstream to fix build failure
+ on SH4. Closes: #532385.
-- Aurelien Jarno <aurel32@debian.org> Sat, 13 Jun 2009 22:25:41 +0200
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-06-14 14:13:00 UTC (rev 3557)
+++ glibc-package/trunk/debian/patches/series 2009-06-14 14:36:57 UTC (rev 3558)
@@ -128,6 +128,7 @@
s390/submitted-nexttowardf.diff
sh4/local-fpscr_values.diff
+sh4/cvs-headers-update.diff
sparc/local-fork.diff
sparc/local-sparcv9-target.diff
Added: glibc-package/trunk/debian/patches/sh4/cvs-headers-update.diff
===================================================================
--- glibc-package/trunk/debian/patches/sh4/cvs-headers-update.diff (rev 0)
+++ glibc-package/trunk/debian/patches/sh4/cvs-headers-update.diff 2009-06-14 14:36:57 UTC (rev 3558)
@@ -0,0 +1,103 @@
+2009-02-26 Andrew Stubbs <ams@codesourcery.com>
+ SUGIOKA Toshinobu <sugioka@itonet.co.jp>
+
+ * sysdeps/unix/sysv/linux/sh/sys/procfs.h: Don't include signal.h,
+ sys/ucontext.h and asm/elf.h. Include sys/user.h.
+ * sysdeps/unix/sysv/linux/sh/sys/user.h: Don't include features.h
+ and asm/user.h. Include asm/ptrace.h.
+ (PTRACE_GETREGS, PTRACE_SETREGS, PTRACE_GETFPREGS,
+ PTRACE_SETFPREGS, PTRACE_GETFDPIC, PTRACE_GETFDPIC_EXEC,
+ PTRACE_GETFDPIC_INTERP, PTRACE_GETDSPREGS, PTRACE_SETDSPREGS):
+ Undefine.
+ (start_thread): Don't undefine.
+ (elf_greg_t, ELF_NGREG, elf_fpregset_t, user_fpu_struct, user):
+ Define.
+
+diff --git a/sysdeps/unix/sysv/linux/sh/sys/procfs.h b/sysdeps/unix/sysv/linux/sh/sys/procfs.h
+index 8651ccb..6261307 100644
+--- a/sysdeps/unix/sysv/linux/sh/sys/procfs.h
++++ b/sysdeps/unix/sysv/linux/sh/sys/procfs.h
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
++/* Copyright (C) 1996, 1997, 1999, 2004, 2009
++ 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
+@@ -24,12 +25,9 @@
+ used on Linux. */
+
+ #include <features.h>
+-#include <signal.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#include <sys/ucontext.h>
+ #include <sys/user.h>
+-#include <asm/elf.h>
+
+ __BEGIN_DECLS
+
+diff --git a/sysdeps/unix/sysv/linux/sh/sys/user.h b/sysdeps/unix/sysv/linux/sh/sys/user.h
+index 7f31bb6..e238e88 100644
+--- a/sysdeps/unix/sysv/linux/sh/sys/user.h
++++ b/sysdeps/unix/sysv/linux/sh/sys/user.h
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
++/* Copyright (C) 1998, 1999, 2000, 2003, 2009
++ 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
+@@ -19,10 +20,49 @@
+ #ifndef _SYS_USER_H
+ #define _SYS_USER_H 1
+
+-#include <features.h>
++#include <asm/ptrace.h>
+
+-#include <asm/user.h>
++/* asm/ptrace.h polutes the namespace. */
++#undef PTRACE_GETREGS
++#undef PTRACE_SETREGS
++#undef PTRACE_GETFPREGS
++#undef PTRACE_SETFPREGS
++#undef PTRACE_GETFDPIC
++#undef PTRACE_GETFDPIC_EXEC
++#undef PTRACE_GETFDPIC_INTERP
++#undef PTRACE_GETDSPREGS
++#undef PTRACE_SETDSPREGS
+
+-#undef start_thread
++typedef unsigned long elf_greg_t;
++
++#define ELF_NGREG (sizeof (struct pt_regs) / sizeof (elf_greg_t))
++typedef elf_greg_t elf_gregset_t[ELF_NGREG];
++
++struct user_fpu_struct
++ {
++ unsigned long fp_regs[16];
++ unsigned long xfp_regs[16];
++ unsigned long fpscr;
++ unsigned long fpul;
++ };
++typedef struct user_fpu_struct elf_fpregset_t;
++
++struct user
++ {
++ struct pt_regs regs;
++ struct user_fpu_struct fpu;
++ int u_fpvalid;
++ size_t u_tsize;
++ size_t u_dsize;
++ size_t u_ssize;
++ unsigned long start_code;
++ unsigned long start_data;
++ unsigned long start_stack;
++ long int signal;
++ unsigned long u_ar0;
++ struct user_fpu_struct *u_fpstate;
++ unsigned long magic;
++ char u_comm[32];
++ };
+
+ #endif /* sys/user.h */
Reply to: