Added GCC 3.3 patches. Closes bug #31083.

5 files changed, 301 insertions, 2 deletions

diff --git a/sys-kernel/gaming-sources/ChangeLog b/sys-kernel/gaming-sources/ChangeLog
index b48e6f6767f2..ca3bd9feaf9b 100644
--- a/sys-kernel/gaming-sources/ChangeLog
+++ b/sys-kernel/gaming-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/gaming-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.9 2003/10/28 00:08:50 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.10 2003/10/28 21:02:25 plasmaroo Exp $
+
+*gaming-sources-2.4.20-r6 (28 Oct 2003)
+
+  28 Oct 2003; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r6.ebuild,
+  files/gaming-sources-2.4.20-gcc33.patch:
+  Added the GCC 3.3 patches, thus a version bump.
 
 gaming-sources-2.4.20-r5 (11 June 2003)
 
diff --git a/sys-kernel/gaming-sources/Manifest b/sys-kernel/gaming-sources/Manifest
index 00117319c87c..7c083029f11b 100644
--- a/sys-kernel/gaming-sources/Manifest
+++ b/sys-kernel/gaming-sources/Manifest
@@ -1,11 +1,14 @@
 MD5 d04f49b453441930eec6ae103218afc8 gaming-sources-2.4.20-r4.ebuild 1063
-MD5 3f1360359767c3623bc55ed40108fea3 ChangeLog 1670
+MD5 1c20057357ce6f2aa44fa4fefa9829e7 ChangeLog 1877
 MD5 0b124474efbcd135f86fcee9d92c7d18 gaming-sources-2.4.20-r2.ebuild 1040
 MD5 47bb029780138002ac573e728b203a5c gaming-sources-2.4.20-r5.ebuild 1111
 MD5 e1e3dc9d0319be5cdbf87fe830b1a291 gaming-sources-2.4.20-r3.ebuild 1040
+MD5 6c60edbb27f822acb7138971618c4838 gaming-sources-2.4.20-r6.ebuild 1121
 MD5 ff3175637b97619fe079ee642a274ed1 gaming-sources-2.4.20-r1.ebuild 1040
 MD5 397187ae2e90b9c425a97102dc0e7d63 files/digest-gaming-sources-2.4.20-r1 210
 MD5 a8af4701934b6cb0dd6c91e151d3b3f8 files/digest-gaming-sources-2.4.20-r2 210
+MD5 3a84a13cd1ae6324e4f754c05a77cb34 files/gaming-sources-2.4.20-gcc33.patch 12143
 MD5 730882db4e587c3718d5d6d9d0316e35 files/digest-gaming-sources-2.4.20-r3 210
 MD5 f618ba7a8f54e0f6f3bd107f3235cb7d files/digest-gaming-sources-2.4.20-r5 210
 MD5 194782effa5a49942568923da61ab5eb files/digest-gaming-sources-2.4.20-r4 210
+MD5 f618ba7a8f54e0f6f3bd107f3235cb7d files/digest-gaming-sources-2.4.20-r6 210
diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r6 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r6
new file mode 100644
index 000000000000..f579357cc013
--- /dev/null
+++ b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r6
@@ -0,0 +1,3 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 b8d7ca0e2c2df2642e919b03e266cdeb patches-2.4.20-gaming-r5.tar.bz2 381905
+MD5 711f2443fb471404077403bfe3253f9b ck4_2.4.20.patch.bz2 1429780
diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20-gcc33.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20-gcc33.patch
new file mode 100644
index 000000000000..fbabd304c80c
--- /dev/null
+++ b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20-gcc33.patch
@@ -0,0 +1,249 @@
+diff -u -r linux-2.4.20-gaming-r5/arch/arm/mach-integrator/pci_v3.c linux-2.4.20-gaming-r6/arch/arm/mach-integrator/pci_v3.c
+--- linux-2.4.20-gaming-r5/arch/arm/mach-integrator/pci_v3.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/arch/arm/mach-integrator/pci_v3.c	2003-09-11 17:32:50.000000000 +0100
+@@ -629,7 +629,6 @@
+ #if 0
+ 	ret = request_irq(IRQ_LBUSTIMEOUT, lb_timeout, 0, "bus timeout", NULL);
+ 	if (ret)
+-		printk(KERN_ERR "PCI: unable to grab local bus timeout ".
+-		       "interrupt: %d\n", ret);
++		printk(KERN_ERR "PCI: unable to grab local bus timeout interrupt: %d\n", ret);
+ #endif
+ }
+diff -u -r linux-2.4.20-gaming-r5/arch/mips64/mm/r4xx0.c linux-2.4.20-gaming-r6/arch/mips64/mm/r4xx0.c
+--- linux-2.4.20-gaming-r5/arch/mips64/mm/r4xx0.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/arch/mips64/mm/r4xx0.c	2003-09-11 17:32:50.000000000 +0100
+@@ -1941,9 +1941,8 @@
+ #ifdef DEBUG_TLB
+ 	if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) ||
+ 	   (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) {
+-		printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d
+-			tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(),
+-			vma->vm_mm) & 0xff), pid);
++		printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n", 
++			(int) (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff), pid);
+ 	}
+ #endif
+ 
+diff -u -r linux-2.4.20-gaming-r5/arch/mips64/mm/tlb-r4k.c linux-2.4.20-gaming-r6/arch/mips64/mm/tlb-r4k.c
+--- linux-2.4.20-gaming-r5/arch/mips64/mm/tlb-r4k.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/arch/mips64/mm/tlb-r4k.c	2003-09-11 17:32:50.000000000 +0100
+@@ -200,9 +200,8 @@
+ #ifdef DEBUG_TLB
+ 	if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) ||
+ 	   (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) {
+-		printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d
+-			tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(),
+-			vma->vm_mm) & 0xff), pid);
++		printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n", 
++			(int) (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff), pid);
+ 	}
+ #endif
+ 
+diff -u -r linux-2.4.20-gaming-r5/drivers/atm/zatm.c linux-2.4.20-gaming-r6/drivers/atm/zatm.c
+--- linux-2.4.20-gaming-r5/drivers/atm/zatm.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/drivers/atm/zatm.c	2003-09-11 17:32:50.000000000 +0100
+@@ -1430,8 +1430,7 @@
+ 	zout(uPD98401_GMR_ONE | uPD98401_BURST8 | uPD98401_BURST4 |
+ 	    uPD98401_BURST2 | uPD98401_GMR_PM | uPD98401_GMR_DR,GMR);
+ 	/* TODO: should shrink allocation now */
+-	printk("mem=%dkB,%s (",zatm_dev->mem >> 10,zatm_dev->copper ? "UTP" :
+-	    "MMF");
++	printk("mem=%dkB,%s (",zatm_dev->mem >> 10,zatm_dev->copper ? "UTP" : "MMF");
+ 	for (i = 0; i < ESI_LEN; i++)
+ 		printk("%02X%s",dev->esi[i],i == ESI_LEN-1 ? ")\n" : "-");
+ 	do {
+diff -u -r linux-2.4.20-gaming-r5/drivers/char/h8.c linux-2.4.20-gaming-r6/drivers/char/h8.c
+--- linux-2.4.20-gaming-r5/drivers/char/h8.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/drivers/char/h8.c	2003-09-11 17:32:50.000000000 +0100
+@@ -574,8 +574,7 @@
+         }
+ 
+         if (intrbuf.word & H8_POWER_BUTTON) {
+-                printk(KERN_CRIT "Power switch pressed - please wait - preparing to power 
+-off\n");
++                printk(KERN_CRIT "Power switch pressed - please wait - preparing to power off\n");
+                 h8_set_event_mask(H8_POWER_BUTTON);
+                 wake_up(&h8_monitor_wait);
+         }
+diff -u -r linux-2.4.20-gaming-r5/drivers/ide/ide-cd.h linux-2.4.20-gaming-r6/drivers/ide/ide-cd.h
+--- linux-2.4.20-gaming-r5/drivers/ide/ide-cd.h	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/drivers/ide/ide-cd.h	2003-09-11 17:32:50.000000000 +0100
+@@ -437,7 +437,7 @@
+ 
+ 	byte     curlba[3];
+ 	byte     nslots;
+-	__u8 short slot_tablelen;
++	__u16 slot_tablelen;
+ };
+  
+  
+diff -u -r linux-2.4.20-gaming-r5/drivers/net/bcm4400/b44.h linux-2.4.20-gaming-r6/drivers/net/bcm4400/b44.h
+--- linux-2.4.20-gaming-r5/drivers/net/bcm4400/b44.h	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/drivers/net/bcm4400/b44.h	2003-09-11 21:37:04.000000000 +0100
+@@ -1079,10 +1079,10 @@
+ /******************************************************************************/
+ 
+ #define REG_RD(pDevice, OffsetName)                                         \
+-        __raw_readl(&((pDevice)->pMemView->##OffsetName))
++        __raw_readl(&((pDevice)->pMemView->OffsetName))
+ 
+ #define REG_WR(pDevice, OffsetName, Value32)                                \
+-        (void) __raw_writel(Value32, &((pDevice)->pMemView->##OffsetName))
++        (void) __raw_writel(Value32, &((pDevice)->pMemView->OffsetName))
+ 
+ #define REG_RD_OFFSET(pDevice, Offset)                                      \
+     __raw_readl(((LM_UINT8 *) (pDevice)->pMemView + Offset))
+diff -u -r linux-2.4.20-gaming-r5/drivers/net/tokenring/olympic.c linux-2.4.20-gaming-r6/drivers/net/tokenring/olympic.c
+--- linux-2.4.20-gaming-r5/drivers/net/tokenring/olympic.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/drivers/net/tokenring/olympic.c	2003-09-11 17:32:50.000000000 +0100
+@@ -655,8 +655,8 @@
+ 	printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7])  );
+ 
+ 	printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
+-	printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr =
+-%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ; 
++	printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr = %08x\n", 
++		olympic_priv->rx_ring_dma_addr,	olympic_priv->rx_status_ring_dma_addr) ; 
+ #endif
+ 
+ 	writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ);
+diff -u -r linux-2.4.20-gaming-r5/drivers/scsi/sun3_NCR5380.c linux-2.4.20-gaming-r6/drivers/scsi/sun3_NCR5380.c
+--- linux-2.4.20-gaming-r5/drivers/scsi/sun3_NCR5380.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/drivers/scsi/sun3_NCR5380.c	2003-09-11 17:32:50.000000000 +0100
+@@ -1226,8 +1226,7 @@
+ 					    BASR_ACK)) ==
+        (BASR_PHASE_MATCH | BASR_ACK)) {
+ 	    printk("scsi%d: BASR %02x\n", HOSTNO, NCR5380_read(BUS_AND_STATUS_REG));
+-	    printk("scsi%d: bus stuck in data phase -- probably a
+- single byte overrun!\n", HOSTNO); 
++	    printk("scsi%d: bus stuck in data phase -- probably a single byte overrun!\n", HOSTNO); 
+ 	    printk("not prepared for this error!\n");
+ 	    printk("please e-mail sammy@sammy.net with a description of how this\n");
+ 	    printk("error was produced.\n");
+diff -u -r linux-2.4.20-gaming-r5/fs/reiserfs/super.c linux-2.4.20-gaming-r6/fs/reiserfs/super.c
+--- linux-2.4.20-gaming-r5/fs/reiserfs/super.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/fs/reiserfs/super.c	2003-09-11 17:32:50.000000000 +0100
+@@ -941,8 +941,7 @@
+     ll_rw_block(READ, 1, &(SB_AP_BITMAP(s)[i].bh)) ;
+     wait_on_buffer(SB_AP_BITMAP(s)[i].bh) ;
+     if (!buffer_uptodate(SB_AP_BITMAP(s)[i].bh)) {
+-      printk("reread_meta_blocks, error reading bitmap block number %d at
+-      %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
++      printk("reread_meta_blocks, error reading bitmap block number %d at %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
+       return 1 ;
+     }
+   }
+diff -u -r linux-2.4.20-gaming-r5/net/core/rtnetlink.c linux-2.4.20-gaming-r6/net/core/rtnetlink.c
+--- linux-2.4.20-gaming-r5/net/core/rtnetlink.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/net/core/rtnetlink.c	2003-09-11 17:32:50.000000000 +0100
+@@ -394,7 +394,7 @@
+  * Malformed skbs with wrong lengths of messages are discarded silently.
+  */
+ 
+-extern __inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
++__inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
+ {
+ 	int err;
+ 	struct nlmsghdr * nlh;
+diff -u -r linux-2.4.20-gaming-r5/net/decnet/dn_table.c linux-2.4.20-gaming-r6/net/decnet/dn_table.c
+--- linux-2.4.20-gaming-r5/net/decnet/dn_table.c	2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gaming-r6/net/decnet/dn_table.c	2003-09-11 17:32:50.000000000 +0100
+@@ -836,8 +836,7 @@
+                 return NULL;
+ 
+         if (in_interrupt() && net_ratelimit()) {
+-                printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table 
+-from interrupt\n"); 
++                printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table from interrupt\n"); 
+                 return NULL;
+         }
+         if ((t = kmalloc(sizeof(struct dn_fib_table), GFP_KERNEL)) == NULL)
+
+diff -u -r linux-2.4.20-gaming-r5/drivers/net/fealnx.c linux-2.4.20-gaming-r6/drivers/net/fealnx.c
+--- linux-2.4.20-gaming-r5/drivers/net/fealnx.c	2003-09-08 19:50:27.000000000 -0700
++++ linux-2.4.20-gaming-r6/drivers/net/fealnx.c	2003-06-13 07:51:34.000000000 -0700
+@@ -937,7 +937,7 @@
+ // 89/9/1 modify,
+ //   np->bcrvalue=0x38;
+ 	np->bcrvalue = 0x10;
+-	np->cralue = 0xe00;	/* rx 128 burst length */
++	np->crvalue = 0xe00;	/* rx 128 burst length */
+ #warning Processor architecture undefined!
+ #endif
+ // 89/12/29 add,
+@@ -1198,7 +1198,6 @@
+ 		printk("\n");
+ 	}
+ 
+-	   + dev->if_port = np->default_port;
+ 	/* Reinit. Gross */
+ 
+ 	/* Reset the chip's Tx and Rx processes. */
+diff -u -r linux-2.4.20-gaming-r5/drivers/net/irda/ma600.c linux-2.4.20-gaming-r6/drivers/net/irda/ma600.c
+--- linux-2.4.20-gaming-r5/drivers/net/irda/ma600.c	2003-09-08 19:50:27.000000000 -0700
++++ linux-2.4.20-gaming-r6/drivers/net/irda/ma600.c	2003-08-25 04:44:42.000000000 -0700
+@@ -51,9 +51,9 @@
+ 	#undef ASSERT(expr, func)
+ 	#define ASSERT(expr, func) \
+ 	if(!(expr)) { \
+-	        printk( "Assertion failed! %s,%s,%s,line=%d\n",\
+-        	#expr,__FILE__,__FUNCTION__,__LINE__); \
+-	        ##func}
++		printk( "Assertion failed! %s,%s,%s,line=%d\n",\
++		#expr,__FILE__,__FUNCTION__,__LINE__); \
++		func}
+ #endif
+ 
+ /* convert hex value to ascii hex */
+diff -u -r linux-2.4.20-gaming-r5/arch/i386/math-emu/poly.h linux-2.4.20-gaming-r6/arch/i386/math-emu/poly.h
+--- linux-2.4.20-gaming-r5/arch/i386/math-emu/poly.h	2003-09-08 19:52:14.000000000 -0700
++++ linux-2.4.20-gaming-r6/arch/i386/math-emu/poly.h	2003-09-08 19:45:38.000000000 -0700
+@@ -75,11 +75,11 @@
+ /* Add the 12 byte Xsig x2 to Xsig dest, with no checks for overflow. */
+ static inline void add_Xsig_Xsig(Xsig *dest, const Xsig *x2)
+ {
+-  asm volatile ("movl %1,%%edi; movl %2,%%esi;
+-                 movl (%%esi),%%eax; addl %%eax,(%%edi);
+-                 movl 4(%%esi),%%eax; adcl %%eax,4(%%edi);
+-                 movl 8(%%esi),%%eax; adcl %%eax,8(%%edi);"
+-                 :"=g" (*dest):"g" (dest), "g" (x2)
++  asm volatile ("movl %1,%%edi; movl %2,%%esi; " \
++                  "movl (%%esi),%%eax; addl %%eax,(%%edi); " \
++                  "movl 4(%%esi),%%eax; adcl %%eax,4(%%edi); " \
++                  "movl 8(%%esi),%%eax; adcl %%eax,8(%%edi); " \ 
++                 :"=g" (*dest):"g" (dest), "g" (x2) \
+                  :"ax","si","di");
+ }
+ 
+@@ -90,18 +90,18 @@
+    problem, but keep fingers crossed! */
+ static inline void add_two_Xsig(Xsig *dest, const Xsig *x2, long int *exp)
+ {
+-  asm volatile ("movl %2,%%ecx; movl %3,%%esi;
+-                 movl (%%esi),%%eax; addl %%eax,(%%ecx);
+-                 movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx);
+-                 movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx);
+-                 jnc 0f;
+-		 rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx)
+-                 movl %4,%%ecx; incl (%%ecx)
+-                 movl $1,%%eax; jmp 1f;
+-                 0: xorl %%eax,%%eax;
+-                 1:"
+-		:"=g" (*exp), "=g" (*dest)
+-		:"g" (dest), "g" (x2), "g" (exp)
++  asm volatile ("movl %2,%%ecx; movl %3,%%esi; " \
++                  "movl (%%esi),%%eax; addl %%eax,(%%ecx); " \
++                  "movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx); " \
++                  "movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx); " \
++                  "jnc 0f; " \
++		  "rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx); " \
++                  "movl %4,%%ecx; incl (%%ecx); " \
++                  "movl $1,%%eax; jmp 1f; " \
++                  "0: xorl %%eax,%%eax; " \
++                  "1: " \
++		:"=g" (*exp), "=g" (*dest) \
++		:"g" (dest), "g" (x2), "g" (exp) \
+ 		:"cx","si","ax");
+ }
+
diff --git a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r6.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r6.ebuild
new file mode 100644
index 000000000000..e03c23b878e3
--- /dev/null
+++ b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r6.ebuild,v 1.1 2003/10/28 21:02:25 plasmaroo Exp $
+
+IUSE="build"
+
+# OKV=original kernel version, KV=patched kernel version.  
+
+ETYPE="sources"
+
+inherit kernel
+
+OKV="2.4.20"
+EXTRAVERSION="-gaming-r6"
+KV="${OKV}${EXTRAVERSION}"
+S=${WORKDIR}/linux-${KV}
+CKV=4_2.4.20
+
+DESCRIPTION="Full sources for the Gentoo gaming-optimized kernel"
+HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/6/5}.tar.bz2 http://members.optusnet.com.au/ckolivas/kernel/ck${CKV}.patch.bz2"
+
+KEYWORDS="-* ~x86"
+SLOT="${KV}"
+
+src_unpack() {
+
+	unpack linux-${OKV}.tar.bz2 patches-${KV/6/5}.tar.bz2
+	bzcat ${DISTDIR}/ck${CKV}.patch.bz2 | patch -p0 || die "-patch failed"
+
+	mv linux-${OKV} linux-${KV} || die
+
+	cd ${KV/6/5} || die #enter the patch directory and go!
+	kernel_src_unpack
+
+	epatch ${FILESDIR}/gaming-sources-2.4.20-gcc33.patch
+
+}