From ba3ef70e78fc3fc766338ec9743c7fd595e922d8 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Sun, 19 Aug 2001 23:42:47 +0000
Subject: [PATCH] 	* archive.c (offsetof): Remove define. 	* elf.c:
 Likewise. 	* oasys.c: Likewise 	* sysdep.h (offsetof): Define.

---
 bfd/ChangeLog | 7 +++++++
 bfd/archive.c | 6 ------
 bfd/elf.c     | 6 ------
 bfd/oasys.c   | 8 --------
 bfd/sysdep.h  | 6 ++++++
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f80b01b06d1..752433e380c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* archive.c (offsetof): Remove define.
+	* elf.c: Likewise.
+	* oasys.c: Likewise
+	* sysdep.h (offsetof): Define.
+
 2001-08-17  Alan Modra  <amodra@bigpond.net.au>
 
 	* bfd.c (bfd_get_gp_size): Return an unsigned int.
diff --git a/bfd/archive.c b/bfd/archive.c
index 5f673e1dfee..daa135efcd3 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -142,12 +142,6 @@ extern int errno;
 #define BFD_GNU960_ARMAG(abfd)	(BFD_COFF_FILE_P((abfd)) ? ARMAG : ARMAGB)
 #endif
 
-/* Define offsetof for those systems which lack it */
-
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-#endif
-
 /* We keep a cache of archive filepointers to archive elements to
    speed up searching the archive by filepos.  We only add an entry to
    the cache when we actually read one.  We also don't sort the cache;
diff --git a/bfd/elf.c b/bfd/elf.c
index 56b7926fb92..8ff3ec8b309 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -5343,12 +5343,6 @@ _bfd_elf_rel_vtable_reloc_fn (abfd, re, symbol, data, is, obfd, errmsg)
 # include <sys/procfs.h>
 #endif
 
-/* Define offsetof for those systems which lack it.  */
-
-#ifndef offsetof
-# define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-#endif
-
 /* FIXME: this is kinda wrong, but it's what gdb wants.  */
 
 static int
diff --git a/bfd/oasys.c b/bfd/oasys.c
index 47e30cbda2d..0b2f88da68a 100644
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -27,14 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "oasys.h"
 #include "liboasys.h"
 
-/* XXX - FIXME.  offsetof belongs in the system-specific files in
-   ../include/sys. */
-/* Define offsetof for those systems which lack it */
-
-#ifndef offsetof
-#define offsetof(type, identifier) (size_t) &(((type *) 0)->identifier)
-#endif
-
 static boolean oasys_read_record PARAMS ((bfd *,
 					  oasys_record_union_type *));
 static boolean oasys_write_sections PARAMS ((bfd *));
diff --git a/bfd/sysdep.h b/bfd/sysdep.h
index bab1c51a272..1338d6b8265 100644
--- a/bfd/sysdep.h
+++ b/bfd/sysdep.h
@@ -125,6 +125,12 @@ extern void free ();
 extern char *getenv ();
 #endif
 
+/* Define offsetof for those systems which lack it */
+
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
 #ifdef ENABLE_NLS
 #include <libintl.h>
 /* Note the use of dgetext() and PACKAGE here, rather than gettext().