Added GCC 3.3 patches: Bug 30891...

2 files changed, 245 insertions, 2 deletions

diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20_pre6 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20_pre6
deleted file mode 100644
index 16165c8cd583..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20_pre6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 f737ae6154fcbead8d84c020c2734ef0 patches-2.4.20-xfs_pre6.tar.bz2 3262742
diff --git a/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch b/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch
new file mode 100644
index 000000000000..9090fbb4e67e
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch
@@ -0,0 +1,245 @@
+diff -u -r linux-2.4.20-xfs-r3/arch/arm/mach-integrator/pci_v3.c linux-2.4.20-xfs-r4/arch/arm/mach-integrator/pci_v3.c
+--- linux-2.4.20-xfs-r3/arch/arm/mach-integrator/pci_v3.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/arch/arm/mach-integrator/pci_v3.c	2003-10-11 11:42:28.000000000 +0200
+@@ -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-xfs-r3/arch/i386/math-emu/poly.h linux-2.4.20-xfs-r4/arch/i386/math-emu/poly.h
+--- linux-2.4.20-xfs-r3/arch/i386/math-emu/poly.h	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/arch/i386/math-emu/poly.h	2003-10-11 11:59:17.000000000 +0200
+@@ -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 -u -r linux-2.4.20-xfs-r3/arch/mips64/mm/r4xx0.c linux-2.4.20-xfs-r4/arch/mips64/mm/r4xx0.c
+--- linux-2.4.20-xfs-r3/arch/mips64/mm/r4xx0.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/arch/mips64/mm/r4xx0.c	2003-10-11 11:44:44.000000000 +0200
+@@ -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-xfs-r3/arch/mips64/mm/tlb-r4k.c linux-2.4.20-xfs-r4/arch/mips64/mm/tlb-r4k.c
+--- linux-2.4.20-xfs-r3/arch/mips64/mm/tlb-r4k.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/arch/mips64/mm/tlb-r4k.c	2003-10-11 11:45:46.000000000 +0200
+@@ -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-xfs-r3/drivers/atm/zatm.c linux-2.4.20-xfs-r4/drivers/atm/zatm.c
+--- linux-2.4.20-xfs-r3/drivers/atm/zatm.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/atm/zatm.c	2003-10-11 11:46:52.000000000 +0200
+@@ -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-xfs-r3/drivers/char/h8.c linux-2.4.20-xfs-r4/drivers/char/h8.c
+--- linux-2.4.20-xfs-r3/drivers/char/h8.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/char/h8.c	2003-10-11 11:47:16.000000000 +0200
+@@ -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-xfs-r3/drivers/ide/ide-cd.h linux-2.4.20-xfs-r4/drivers/ide/ide-cd.h
+--- linux-2.4.20-xfs-r3/drivers/ide/ide-cd.h	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/ide/ide-cd.h	2003-10-11 11:47:59.000000000 +0200
+@@ -438,7 +438,7 @@
+ 
+ 	byte     curlba[3];
+ 	byte     nslots;
+-	__u8 short slot_tablelen;
++	__u16 slot_tablelen;
+ };
+ 
+ 
+diff -u -r linux-2.4.20-xfs-r3/drivers/net/bcm4400/b44.h linux-2.4.20-xfs-r4/drivers/net/bcm4400/b44.h
+--- linux-2.4.20-xfs-r3/drivers/net/bcm4400/b44.h	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/net/bcm4400/b44.h	2003-10-11 11:48:41.000000000 +0200
+@@ -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-xfs-r3/drivers/net/fealnx.c linux-2.4.20-xfs-r4/drivers/net/fealnx.c
+--- linux-2.4.20-xfs-r3/drivers/net/fealnx.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/net/fealnx.c	2003-10-11 11:54:07.000000000 +0200
+@@ -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-xfs-r3/drivers/net/irda/ma600.c linux-2.4.20-xfs-r4/drivers/net/irda/ma600.c
+--- linux-2.4.20-xfs-r3/drivers/net/irda/ma600.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/net/irda/ma600.c	2003-10-11 11:55:09.000000000 +0200
+@@ -53,7 +53,7 @@
+ 	if(!(expr)) { \
+ 	        printk( "Assertion failed! %s,%s,%s,line=%d\n",\
+         	#expr,__FILE__,__FUNCTION__,__LINE__); \
+-	        ##func}
++	        func}
+ #endif
+ 
+ /* convert hex value to ascii hex */
+diff -u -r linux-2.4.20-xfs-r3/drivers/net/tokenring/olympic.c linux-2.4.20-xfs-r4/drivers/net/tokenring/olympic.c
+--- linux-2.4.20-xfs-r3/drivers/net/tokenring/olympic.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/net/tokenring/olympic.c	2003-10-11 11:49:21.000000000 +0200
+@@ -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-xfs-r3/drivers/scsi/sun3_NCR5380.c linux-2.4.20-xfs-r4/drivers/scsi/sun3_NCR5380.c
+--- linux-2.4.20-xfs-r3/drivers/scsi/sun3_NCR5380.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/scsi/sun3_NCR5380.c	2003-10-11 11:50:00.000000000 +0200
+@@ -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-xfs-r3/fs/reiserfs/super.c linux-2.4.20-xfs-r4/fs/reiserfs/super.c
+--- linux-2.4.20-xfs-r3/fs/reiserfs/super.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/fs/reiserfs/super.c	2003-10-11 11:51:48.000000000 +0200
+@@ -941,8 +941,8 @@
+     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-xfs-r3/net/core/rtnetlink.c linux-2.4.20-xfs-r4/net/core/rtnetlink.c
+--- linux-2.4.20-xfs-r3/net/core/rtnetlink.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/net/core/rtnetlink.c	2003-10-11 11:52:25.000000000 +0200
+@@ -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-xfs-r3/net/decnet/dn_table.c linux-2.4.20-xfs-r4/net/decnet/dn_table.c
+--- linux-2.4.20-xfs-r3/net/decnet/dn_table.c	2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/net/decnet/dn_table.c	2003-10-11 11:52:48.000000000 +0200
+@@ -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)