Added support for sparc64-multilib and updated sparc patch to what has been included upstream.

3 files changed, 73 insertions, 72 deletions

diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index d056b283da5f..24f91ef42add 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/linux26-headers
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.39 2004/12/09 15:36:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.40 2004/12/11 21:28:13 eradicator Exp $
+
+  11 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch,
+  linux26-headers-2.6.8.1-r1.ebuild:
+  Added support for sparc64-multilib and updated sparc patch to what has been
+  included upstream.
 
   09 Dec 2004; Mike Frysinger <vapier@gentoo.org>
   linux26-headers-2.6.8.1-r1.ebuild:
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch
index 04e26fd0d428..ae11fc5a92de 100644
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch
@@ -1,5 +1,54 @@
---- linux/include/asm-sparc/signal.h.orig	2004-12-07 14:53:47.747817312 -0800
-+++ linux/include/asm-sparc/signal.h	2004-12-07 14:52:42.165787296 -0800
+diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/processor.h linux-2.6.8.1.fixsparc/include/asm-sparc/processor.h
+--- linux-2.6.8.1-vanilla/include/asm-sparc/processor.h	2004-08-14 03:56:23.000000000 -0700
++++ linux-2.6.8.1.fixsparc/include/asm-sparc/processor.h	2004-12-08 21:51:38.539378457 -0800
+@@ -43,10 +43,12 @@
+ 
+ struct task_struct;
+ 
++#ifdef __KERNEL__
+ struct fpq {
+ 	unsigned long *insn_addr;
+ 	unsigned long insn;
+ };
++#endif
+ 
+ typedef struct {
+ 	int seg;
+diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/sigcontext.h linux-2.6.8.1.fixsparc/include/asm-sparc/sigcontext.h
+--- linux-2.6.8.1-vanilla/include/asm-sparc/sigcontext.h	2004-08-14 03:54:52.000000000 -0700
++++ linux-2.6.8.1.fixsparc/include/asm-sparc/sigcontext.h	2004-12-08 21:56:46.419515413 -0800
+@@ -4,7 +4,6 @@
+ 
+ #ifdef __KERNEL__
+ #include <asm/ptrace.h>
+-#endif
+ 
+ #ifndef __ASSEMBLY__
+ 
+@@ -57,8 +56,6 @@
+ 	} si_fpqueue [16];
+ } __siginfo_fpu_t;
+ 
+-#ifdef __KERNEL__
+-
+ /* This magic should be in g_upper[0] for all upper parts
+    to be valid.
+    This is generated by sparc64 only, but for 32bit processes,
+@@ -69,8 +66,9 @@
+ 	unsigned   int o_upper[8];
+ } siginfo_extra_v8plus_t;
+ 
+-#endif
+-
+ #endif /* !(__ASSEMBLY__) */
+ 
++#endif /* (__KERNEL__) */
++
+ #endif /* !(__SPARC_SIGCONTEXT_H) */
++
+diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/signal.h linux-2.6.8.1.fixsparc/include/asm-sparc/signal.h
+--- linux-2.6.8.1-vanilla/include/asm-sparc/signal.h	2004-08-14 03:55:34.000000000 -0700
++++ linux-2.6.8.1.fixsparc/include/asm-sparc/signal.h	2004-12-08 21:49:19.124410374 -0800
 @@ -3,6 +3,7 @@
  #define _ASMSPARC_SIGNAL_H
  
@@ -8,12 +57,12 @@
  
  #ifdef __KERNEL__
  #ifndef __ASSEMBLY__
-@@ -113,11 +114,14 @@
+@@ -111,11 +112,14 @@
  	unsigned long	sig[_NSIG_WORDS];
  } __new_sigset_t;
  
 +
-+#ifndef _SIGNAL_H
++#ifdef __KERNEL__
  /* A SunOS sigstack */
  struct sigstack {
  	char *the_stack;
@@ -23,86 +72,32 @@
  
  /* Sigvec flags */
  #define _SV_SSTACK    1u    /* This signal handler should use sig-stack */
-@@ -191,12 +195,14 @@
+@@ -189,6 +193,7 @@
  #define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
  #define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
  
-+#ifndef _SIGNAL_H
++#ifdef __KERNEL__
  struct __new_sigaction {
  	__sighandler_t	sa_handler;
  	unsigned long	sa_flags;
- 	void		(*sa_restorer)(void);	/* Not used by Linux/SPARC */
+@@ -196,12 +201,10 @@
  	__new_sigset_t	sa_mask;
  };
-+#endif
  
- #ifdef __KERNEL__
+-#ifdef __KERNEL__
  struct k_sigaction {
-@@ -205,6 +211,7 @@
+ 	struct __new_sigaction	sa;
+ 	void			__user *ka_restorer;
  };
- #endif
+-#endif
  
-+#ifndef _SIGNAL_H
  struct __old_sigaction {
  	__sighandler_t	sa_handler;
- 	__old_sigset_t	sa_mask;
-@@ -217,6 +224,7 @@
- 	int		ss_flags;
+@@ -216,7 +219,6 @@
  	size_t		ss_size;
  } stack_t;
-+#endif
- 
- #ifdef __KERNEL__
- struct sparc_deliver_cookie {
---- linux/include/asm-sparc/sigcontext.h.orig	2004-12-07 14:46:54.492641648 -0800
-+++ linux/include/asm-sparc/sigcontext.h	2004-12-07 15:04:19.167826880 -0800
-@@ -4,9 +4,9 @@
- 
- #ifdef __KERNEL__
- #include <asm/ptrace.h>
--#endif
- 
- #ifndef __ASSEMBLY__
-+#ifndef _SIGNAL_H
- 
- #define __SUNOS_MAXWIN   31
- 
-@@ -57,8 +57,6 @@
- 	} si_fpqueue [16];
- } __siginfo_fpu_t;
  
 -#ifdef __KERNEL__
--
- /* This magic should be in g_upper[0] for all upper parts
-    to be valid.
-    This is generated by sparc64 only, but for 32bit processes,
-@@ -69,8 +67,13 @@
- 	unsigned   int o_upper[8];
- } siginfo_extra_v8plus_t;
- 
--#endif
-+#endif /* !(_SIGNAL_H) */
- 
- #endif /* !(__ASSEMBLY__) */
- 
-+#else /* !(__KERNEL__) */
-+#include <signal.h> /* Pulls in <bits/sigcontext.h> which contains both /*
-+                    /* of these structures... */
-+#endif
-+
- #endif /* !(__SPARC_SIGCONTEXT_H) */
---- linux/include/asm-sparc/processor.h.orig	2004-12-07 15:14:37.267861392 -0800
-+++ linux/include/asm-sparc/processor.h	2004-12-07 15:14:49.898941176 -0800
-@@ -43,10 +43,12 @@
- 
- struct task_struct;
- 
-+#ifndef _SYS_UCONTEXT_H
- struct fpq {
- 	unsigned long *insn_addr;
- 	unsigned long insn;
- };
-+#endif
- 
- typedef struct {
- 	int seg;
+ struct sparc_deliver_cookie {
+ 	int restart_syscall;
+ 	unsigned long orig_i0;
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
index 400278526384..c048f21aacd4 100644
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.17 2004/12/09 15:36:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.18 2004/12/11 21:28:13 eradicator Exp $
 
 # What's in this kernel?
 
@@ -108,7 +108,7 @@ src_install() {
 	kernel_src_install
 
 	# If this is sparc, then we need to place asm_offsets.h in the proper location(s)
-	if [ "${PROFILE_ARCH}" = "sparc64" ] ; then
+	if [ "${PROFILE_ARCH}" = "sparc64" -o "${PROFILE_ARCH}" = "sparc64-multilib" ] ; then
 		# We don't need the asm dir, generate-asm-sparc will take care of this
 		rm -Rf ${D}/${LINUX_INCDIR}/asm