summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2003-09-13 12:07:52 +0000
committerTim Yamin <plasmaroo@gentoo.org>2003-09-13 12:07:52 +0000
commit1315b9f13ed5ae5d2f0cf46b3181260d89717405 (patch)
tree60956a0caa4fae8d6c22bd852ca4019de8f7f6e1 /sys-kernel
parentMoved dev-cpp/prc-tools over to dev-lang/ (diff)
downloadhistorical-1315b9f13ed5ae5d2f0cf46b3181260d89717405.tar.gz
historical-1315b9f13ed5ae5d2f0cf46b3181260d89717405.tar.bz2
historical-1315b9f13ed5ae5d2f0cf46b3181260d89717405.zip
Added more GCC3.3 fixes...
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/gentoo-sources/ChangeLog5
-rw-r--r--sys-kernel/gentoo-sources/Manifest4
-rw-r--r--sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch89
3 files changed, 95 insertions, 3 deletions
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 48075fe9e68a..bcfc8a1bdaaa 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-kernel/gentoo-sources
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.27 2003/09/11 21:10:30 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.28 2003/09/13 12:07:43 plasmaroo Exp $
+
+ 13 Sep 2003; <plasmaroo@gentoo.org> files/gentoo-sources-2.4.20-gcc33.patch:
+ Added more GCC3.3 fixes
*gentoo-sources-2.4.20-r7 (11 Sep 2003)
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index ca6912b23d7f..25fac7175046 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,10 +1,10 @@
-MD5 294997569a6b849749cceb2b399bcbec ChangeLog 8964
+MD5 fdc7703833119156cab5ba738e8ba316 ChangeLog 9070
MD5 d5979ff24ef45e712ff68e48cf7c66c0 gentoo-sources-2.4.19-r10.ebuild 2113
MD5 ddabbaab68f79f8777387ff663ae3ae9 gentoo-sources-2.4.20-r7.ebuild 4754
MD5 4a2e7892431d591f82bb474d737cb4eb gentoo-sources-2.4.20-r5.ebuild 4571
MD5 a6f7282c48e8a34145a255bc5cb8bbd1 gentoo-sources-2.4.20-r6.ebuild 4725
MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
-MD5 404ef7420b861ed2d55452d7e4c4c207 files/gentoo-sources-2.4.20-gcc33.patch 9114
+MD5 936c72f5c9192448859a4cba8473c3ba files/gentoo-sources-2.4.20-gcc33.patch 12778
MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145
MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch
index a5ee8e32f032..f2d2abc56f54 100644
--- a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch
@@ -172,3 +172,92 @@ diff -u -r linux-2.4.20-gentoo-r6/net/decnet/dn_table.c linux-2.4.20-gentoo-r7/n
return NULL;
}
if ((t = kmalloc(sizeof(struct dn_fib_table), GFP_KERNEL)) == NULL)
+
+diff -u -r linux-2.4.20-gentoo-r6/drivers/net/fealnx.c linux-2.4.20-gentoo-r7/drivers/net/fealnx.c
+--- linux-2.4.20-gentoo-r6/drivers/net/fealnx.c 2003-09-08 19:50:27.000000000 -0700
++++ linux-2.4.20-gentoo-r7/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-gentoo-r6/drivers/net/irda/ma600.c linux-2.4.20-gentoo-r7/drivers/net/irda/ma600.c
+--- linux-2.4.20-gentoo-r6/drivers/net/irda/ma600.c 2003-09-08 19:50:27.000000000 -0700
++++ linux-2.4.20-gentoo-r7/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-gentoo-r6/arch/i386/math-emu/poly.h linux-2.4.20-gentoo-r7/arch/i386/math-emu/poly.h
+--- linux-2.4.20-gentoo-r6/arch/i386/math-emu/poly.h 2003-09-08 19:52:14.000000000 -0700
++++ linux-2.4.20-gentoo-r7/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");
+ }
+
+