Update sparc fix once again to work when asm/processor is included before glibc headers.

2 files changed, 41 insertions, 20 deletions

diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index 24f91ef42add..13889015a0d5 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,11 @@
 # 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.40 2004/12/11 21:28:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.41 2004/12/12 10:37:21 eradicator Exp $
+
+  12 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch:
+  Update sparc fix once again to work when asm/processor is included before
+  glibc headers.
 
   11 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch,
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 ae11fc5a92de..9bddffada13c 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,22 +1,39 @@
-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 @@
+--- linux/include/asm-sparc/processor.h.orig	2004-12-11 22:21:32.889748424 -0800
++++ linux/include/asm-sparc/processor.h	2004-12-11 22:21:21.616462224 -0800
+@@ -43,7 +43,11 @@
  
  struct task_struct;
  
+-struct fpq {
 +#ifdef __KERNEL__
- struct fpq {
++#define __fpq fpq
++#endif
++
++struct __fpq {
  	unsigned long *insn_addr;
  	unsigned long insn;
  };
+@@ -65,13 +69,17 @@ struct thread_struct {
+ 	unsigned long   float_regs[32] __attribute__ ((aligned (8)));
+ 	unsigned long   fsr;
+ 	unsigned long   fpqdepth;
+-	struct fpq	fpqueue[16];
++	struct __fpq	fpqueue[16];
+ 	unsigned long flags;
+ 	mm_segment_t current_ds;
+ 	struct exec core_exec;     /* just what it says. */
+ 	int new_signal;
+ };
+ 
++#ifdef __KERNEL__
++#undef __fpq
 +#endif
++
+ #define SPARC_FLAG_KTHREAD      0x1    /* task is a kernel thread */
+ #define SPARC_FLAG_UNALIGNED    0x2    /* is allowed to do unaligned accesses */
  
- 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
+--- linux/include/asm-sparc/sigcontext.h.orig	2004-12-11 22:21:32.890748272 -0800
++++ linux/include/asm-sparc/sigcontext.h	2004-12-11 22:21:01.759480944 -0800
 @@ -4,7 +4,6 @@
  
  #ifdef __KERNEL__
@@ -25,7 +42,7 @@ diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/sigcontext.h linux-2.6.8.1.fi
  
  #ifndef __ASSEMBLY__
  
-@@ -57,8 +56,6 @@
+@@ -57,8 +56,6 @@ typedef struct {
  	} si_fpqueue [16];
  } __siginfo_fpu_t;
  
@@ -34,7 +51,7 @@ diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/sigcontext.h linux-2.6.8.1.fi
  /* 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 @@
+@@ -69,8 +66,9 @@ typedef struct {
  	unsigned   int o_upper[8];
  } siginfo_extra_v8plus_t;
  
@@ -46,9 +63,8 @@ diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/sigcontext.h linux-2.6.8.1.fi
 +
  #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
+--- linux/include/asm-sparc/signal.h.orig	2004-12-11 22:21:32.891748120 -0800
++++ linux/include/asm-sparc/signal.h	2004-12-11 22:21:01.768479576 -0800
 @@ -3,6 +3,7 @@
  #define _ASMSPARC_SIGNAL_H
  
@@ -57,7 +73,7 @@ diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/signal.h linux-2.6.8.1.fixspa
  
  #ifdef __KERNEL__
  #ifndef __ASSEMBLY__
-@@ -111,11 +112,14 @@
+@@ -113,11 +114,14 @@ typedef struct {
  	unsigned long	sig[_NSIG_WORDS];
  } __new_sigset_t;
  
@@ -72,7 +88,7 @@ diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/signal.h linux-2.6.8.1.fixspa
  
  /* Sigvec flags */
  #define _SV_SSTACK    1u    /* This signal handler should use sig-stack */
-@@ -189,6 +193,7 @@
+@@ -191,6 +195,7 @@ typedef void (*__sighandler_t)(int);
  #define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
  #define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
  
@@ -80,7 +96,7 @@ diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/signal.h linux-2.6.8.1.fixspa
  struct __new_sigaction {
  	__sighandler_t	sa_handler;
  	unsigned long	sa_flags;
-@@ -196,12 +201,10 @@
+@@ -198,12 +203,10 @@ struct __new_sigaction {
  	__new_sigset_t	sa_mask;
  };
  
@@ -93,7 +109,7 @@ diff -Naur linux-2.6.8.1-vanilla/include/asm-sparc/signal.h linux-2.6.8.1.fixspa
  
  struct __old_sigaction {
  	__sighandler_t	sa_handler;
-@@ -216,7 +219,6 @@
+@@ -218,7 +221,6 @@ typedef struct sigaltstack {
  	size_t		ss_size;
  } stack_t;