diff --git a/package/x86/grub/gcc40.patch b/package/x86/grub/gcc40.patch new file mode 100644 index 000000000..aabc07800 --- /dev/null +++ b/package/x86/grub/gcc40.patch @@ -0,0 +1,55 @@ +diff -dur grub-0.97/netboot/main.c src.grub.1130286324.30284.3996273791/grub-0.97/netboot/main.c +--- grub-0.97/netboot/main.c 2004-05-21 00:19:33.000000000 +0200 ++++ src.grub.1130286324.30284.3996273791/grub-0.97/netboot/main.c 2005-10-26 02:37:58.000000000 +0200 +@@ -54,9 +54,9 @@ + + static int vendorext_isvalid; + static unsigned long netmask; +-static struct bootpd_t bootp_data; ++struct bootpd_t bootp_data; + static unsigned long xid; +-static unsigned char *end_of_rfc1533 = NULL; ++unsigned char *end_of_rfc1533 = NULL; + + #ifndef NO_DHCP_SUPPORT + #endif /* NO_DHCP_SUPPORT */ +--- grub-0.97/netboot/natsemi.c 2003-07-09 13:45:38.000000000 +0200 ++++ src.grub.1130288662.25040.1734126933/grub-0.97/netboot/natsemi.c 2005-10-26 03:18:03.000000000 +0200 +@@ -608,7 +608,7 @@ + const char *p) /* Packet */ + { + u32 status, to, nstype; +- u32 tx_status; ++ volatile u32 tx_status; + + /* Stop the transmitter */ + outl(TxOff, ioaddr + ChipCmd); +@@ -647,7 +647,7 @@ + + to = currticks() + TX_TIMEOUT; + +- while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) ++ while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) + /* wait */ ; + + if (currticks() >= to) { +--- grub-0.97/netboot/sis900.c~ 2003-07-09 13:45:38.000000000 +0200 ++++ grub-0.97/netboot/sis900.c 2005-10-26 03:30:39.000000000 +0200 +@@ -901,7 +901,7 @@ + const char *p) /* Packet */ + { + u32 status, to, nstype; +- u32 tx_status; ++ volatile u32 tx_status; + + /* Stop the transmitter */ + outl(TxDIS, ioaddr + cr); +@@ -940,7 +940,7 @@ + + to = currticks() + TX_TIMEOUT; + +- while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) ++ while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) + /* wait */ ; + + if (currticks() >= to) { diff --git a/package/x86/grub/grub.desc b/package/x86/grub/grub.desc index d90926264..5426a922a 100644 --- a/package/x86/grub/grub.desc +++ b/package/x86/grub/grub.desc @@ -46,8 +46,8 @@ [L] GPL [S] Stable -[V] 0.96 +[V] 0.97 [P] X -?---5---9 203.900 -[D] 3292931770 grub-0.96.tar.gz ftp://alpha.gnu.org/gnu/grub/ +[D] 3065767847 grub-0.97.tar.gz ftp://alpha.gnu.org/gnu/grub/