[build] Fix misaligned table entries when using gcc 4.5

Declarations without the accompanying __table_entry cause misalignment
of the table entries when using gcc 4.5.  Fix by adding the
appropriate __table_entry macro or (where possible) by removing
unnecessary forward declarations.

Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

7 files changed, 4 insertions, 10 deletions

diff --git a/src/net/aoe.c b/src/net/aoe.c
index 4b700073a..4a03e2b64 100644
--- a/src/net/aoe.c
+++ b/src/net/aoe.c
@@ -44,7 +44,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 FEATURE ( FEATURE_PROTOCOL, "AoE", DHCP_EB_FEATURE_AOE, 1 );
 
-struct net_protocol aoe_protocol;
+struct net_protocol aoe_protocol __net_protocol;
 
 /** List of all AoE sessions */
 static LIST_HEAD ( aoe_sessions );
diff --git a/src/net/arp.c b/src/net/arp.c
index fe4dbff91..714b471bd 100644
--- a/src/net/arp.c
+++ b/src/net/arp.c
@@ -63,7 +63,7 @@ static struct arp_entry arp_table[NUM_ARP_ENTRIES];
 
 static unsigned int next_new_arp_entry = 0;
 
-struct net_protocol arp_protocol;
+struct net_protocol arp_protocol __net_protocol;
 
 /**
  * Find entry in the ARP cache
diff --git a/src/net/eth_slow.c b/src/net/eth_slow.c
index 86fe62c3b..4b2df2800 100644
--- a/src/net/eth_slow.c
+++ b/src/net/eth_slow.c
@@ -40,7 +40,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * partner sends us.
  */
 
-struct net_protocol eth_slow_protocol;
+struct net_protocol eth_slow_protocol __net_protocol;
 
 /** Slow protocols multicast address */
 static const uint8_t eth_slow_address[ETH_ALEN] =
diff --git a/src/net/icmpv6.c b/src/net/icmpv6.c
index ab8a65ec9..1a5aad3ba 100644
--- a/src/net/icmpv6.c
+++ b/src/net/icmpv6.c
@@ -11,8 +11,6 @@
 #include <ipxe/tcpip.h>
 #include <ipxe/netdevice.h>
 
-struct tcpip_protocol icmp6_protocol;
-
 /**
  * Send neighbour solicitation packet
  *
diff --git a/src/net/ipv4.c b/src/net/ipv4.c
index 954865270..a3cbdb039 100644
--- a/src/net/ipv4.c
+++ b/src/net/ipv4.c
@@ -26,8 +26,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* Unique IP datagram identification number */
 static uint16_t next_ident = 0;
 
-struct net_protocol ipv4_protocol;
-
 /** List of IPv4 miniroutes */
 struct list_head ipv4_miniroutes = LIST_HEAD_INIT ( ipv4_miniroutes );
 
diff --git a/src/net/ipv6.c b/src/net/ipv6.c
index 781d7628a..ffaa558bf 100644
--- a/src/net/ipv6.c
+++ b/src/net/ipv6.c
@@ -15,8 +15,6 @@
 #include <ipxe/netdevice.h>
 #include <ipxe/if_ether.h>
 
-struct net_protocol ipv6_protocol;
-
 /* Unspecified IP6 address */
 static struct in6_addr ip6_none = {
         .in6_u.u6_addr32 = { 0,0,0,0 }
diff --git a/src/net/udp.c b/src/net/udp.c
index 0ed1503a2..9bd80f3a3 100644
--- a/src/net/udp.c
+++ b/src/net/udp.c
@@ -44,7 +44,7 @@ static LIST_HEAD ( udp_conns );
 
 /* Forward declatations */
 static struct interface_descriptor udp_xfer_desc;
-struct tcpip_protocol udp_protocol;
+struct tcpip_protocol udp_protocol __tcpip_protocol;
 
 /**
  * Bind UDP connection to local port