* archive.c (offsetof): Remove define.

	* elf.c: Likewise.
	* oasys.c: Likewise
	* sysdep.h (offsetof): Define.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f80b01b06d1de5dfb335f2d5f887ecd8ee7494ef..752433e380c59fb0bef9f72d27abd62ec15917cc 100644 (file)
--- 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 5f673e1dfee913207257946b66984d1781b74751..daa135efcd3a9042c2c30d40354994109ec02c82 100644 (file)
--- 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 56b7926fb9234dd682f092dfa0531ed347082a3f..8ff3ec8b309c8534dbdea1e307fe676df75f6b3e 100644 (file)
--- 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 47e30cbda2d77bcc2eb78da6eecd2b9791b7115f..0b2f88da68a539621d5382c45f3c3986c7d4a1fc 100644 (file)
--- 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 bab1c51a272b60a2e69b37473494cc58f2d9d484..1338d6b82658dc1d710779c4b2cf8009434f25b6 100644 (file)
--- 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().