You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
78 lines
2.5 KiB
78 lines
2.5 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../grub/gcc-4.0.patch |
|
# Copyright (C) 2004 - 2006 The T2 SDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
|
|
The usual GCC-4.0 uncovered issues. |
|
|
|
- Rene Rebe <[email protected]> |
|
|
|
--- grub-0.97/netboot/etherboot.h.vanilla 2005-10-31 11:04:15.000000000 +0100 |
|
+++ grub-0.97/netboot/etherboot.h 2005-10-31 11:05:47.000000000 +0100 |
|
@@ -531,9 +531,9 @@ |
|
extern int network_ready; |
|
extern struct rom_info rom; |
|
extern struct arptable_t arptable[MAX_ARP]; |
|
-extern struct bootpd_t bootp_data; |
|
+static struct bootpd_t bootp_data; |
|
#define BOOTP_DATA_ADDR (&bootp_data) |
|
-extern unsigned char *end_of_rfc1533; |
|
+static unsigned char *end_of_rfc1533; |
|
|
|
/* config.c */ |
|
extern struct nic nic; |
|
--- grub-0.97/netboot/natsemi.c.vanilla 2005-10-31 11:09:29.000000000 +0100 |
|
+++ grub-0.97/netboot/natsemi.c 2005-10-31 11:11:08.000000000 +0100 |
|
@@ -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,9 +647,10 @@ |
|
|
|
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) { |
|
printf("natsemi_transmit: TX Timeout! Tx status %X.\n", tx_status); |
|
} |
|
--- grub-0.97/netboot/sis900.c.vanilla 2005-10-31 11:14:48.000000000 +0100 |
|
+++ grub-0.97/netboot/sis900.c 2005-10-31 11:15:03.000000000 +0100 |
|
@@ -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) {
|
|
|