aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-05-02 18:55:59 +0000
committerUlrich Drepper <drepper@redhat.com>1999-05-02 18:55:59 +0000
commit1331528f071d07ca1c4f02800a5fc8244f70adca (patch)
treedc424fde607d0197bde9f6f08f877a012d0efa0f
parent686dfcd106e96e3f991cec76c8d0e434cf97fe54 (diff)
downloadglibc-1331528f071d07ca1c4f02800a5fc8244f70adca.tar
glibc-1331528f071d07ca1c4f02800a5fc8244f70adca.tar.gz
glibc-1331528f071d07ca1c4f02800a5fc8244f70adca.tar.bz2
glibc-1331528f071d07ca1c4f02800a5fc8244f70adca.zip
Update.
1999-04-14 Scott Bambrough <scottb@netwinder.org> * sysdeps/unix/sysv/linux/arm/net/ethernet.h: struct ether_addr and struct ether_header must be packed on the ARM. The default alignment constraints add padding to the end of the structures. 1999-04-14 Scott Bambrough <scottb@netwinder.org> * inet/arpa/tftp.h: struct tftphdr must be packed on the ARM. The default alignment constraints add padding to the end of the structure and between members.
-rw-r--r--ChangeLog12
-rw-r--r--inet/arpa/tftp.h2
-rw-r--r--sysdeps/unix/sysv/linux/net/ethernet.h6
3 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bbd9700a62..8e7cefb1b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-04-14 Scott Bambrough <scottb@netwinder.org>
+
+ * sysdeps/unix/sysv/linux/arm/net/ethernet.h: struct ether_addr
+ and struct ether_header must be packed on the ARM. The default
+ alignment constraints add padding to the end of the structures.
+
+1999-04-14 Scott Bambrough <scottb@netwinder.org>
+
+ * inet/arpa/tftp.h: struct tftphdr must be packed on the ARM. The
+ default alignment constraints add padding to the end of the
+ structure and between members.
+
1999-05-02 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Use
diff --git a/inet/arpa/tftp.h b/inet/arpa/tftp.h
index 0904407c73..719c31bf7d 100644
--- a/inet/arpa/tftp.h
+++ b/inet/arpa/tftp.h
@@ -58,7 +58,7 @@ struct tftphdr {
char tu_stuff[1]; /* request packet stuff */
} th_u;
char th_data[1]; /* data or error string */
-};
+} __attribute__ ((__packed__));
#define th_block th_u.tu_block
#define th_code th_u.tu_code
diff --git a/sysdeps/unix/sysv/linux/net/ethernet.h b/sysdeps/unix/sysv/linux/net/ethernet.h
index 89a92c53f1..c8093bc5a5 100644
--- a/sysdeps/unix/sysv/linux/net/ethernet.h
+++ b/sysdeps/unix/sysv/linux/net/ethernet.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ __BEGIN_DECLS
struct ether_addr
{
u_int8_t ether_addr_octet[ETH_ALEN];
-};
+} __attribute__ ((__packed__));
/* 10Mb/s ethernet header */
struct ether_header
@@ -41,7 +41,7 @@ struct ether_header
u_int8_t ether_dhost[ETH_ALEN]; /* destination eth addr */
u_int8_t ether_shost[ETH_ALEN]; /* source ether addr */
u_int16_t ether_type; /* packet type ID field */
-};
+} __attribute__ ((__packed__));
/* Ethernet protocol ID's */
#define ETHERTYPE_PUP 0x0200 /* Xerox PUP */