summaryrefslogtreecommitdiff
path: root/bfd/archive.c
diff options
context:
space:
mode:
authorBen Elliston <bje@au.ibm.com>2005-02-24 20:16:56 +0000
committerBen Elliston <bje@au.ibm.com>2005-02-24 20:16:56 +0000
commit6bf9196b9f4eaf625f3c1c1f09e642859e1cc1ae (patch)
tree66049a85a6379fd653660d675962212c5cba0c43 /bfd/archive.c
parentc00da352c65ef542aab5b5dcfd81f56c99d017c2 (diff)
downloadgdb-6bf9196b9f4eaf625f3c1c1f09e642859e1cc1ae.tar.gz
* coffcode.h (coff_sym_filepos): Remove GNU960 conditional code.
* format.c (bfd_check_format_matches): Likewise. * archive.c (BFD_GNU960_ARMAG): Likewise. (bfd_generic_archive_p): Likewise. (_bfd_write_archive_contents): Likewise.
Diffstat (limited to 'bfd/archive.c')
-rw-r--r--bfd/archive.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/bfd/archive.c b/bfd/archive.c
index da25f607868..4473975f2d4 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -138,10 +138,6 @@ DESCRIPTION
extern int errno;
#endif
-#ifdef GNU960
-#define BFD_GNU960_ARMAG(abfd) (BFD_COFF_FILE_P((abfd)) ? ARMAG : ARMAGB)
-#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;
@@ -581,14 +577,9 @@ bfd_generic_archive_p (bfd *abfd)
return NULL;
}
-#ifdef GNU960
- if (strncmp (armag, BFD_GNU960_ARMAG (abfd), SARMAG) != 0)
- return 0;
-#else
if (strncmp (armag, ARMAG, SARMAG) != 0 &&
strncmp (armag, ARMAGB, SARMAG) != 0)
return 0;
-#endif
tdata_hold = bfd_ardata (abfd);
@@ -1652,11 +1643,7 @@ _bfd_write_archive_contents (bfd *arch)
if (bfd_seek (arch, (file_ptr) 0, SEEK_SET) != 0)
return FALSE;
-#ifdef GNU960
- wrote = bfd_bwrite (BFD_GNU960_ARMAG (arch), SARMAG, arch);
-#else
wrote = bfd_bwrite (ARMAG, SARMAG, arch);
-#endif
if (wrote != SARMAG)
return FALSE;