diff options
| author | Ben Elliston <bje@au.ibm.com> | 2005-02-24 20:16:56 +0000 |
|---|---|---|
| committer | Ben Elliston <bje@au.ibm.com> | 2005-02-24 20:16:56 +0000 |
| commit | 10adf131a598d8a101af9e0f8eadcb3a935eb943 (patch) | |
| tree | d3bf084ca0cfa6180e46dc67f5f2835c3793a5ba /bfd/archive.c | |
| parent | 0ef622cbcfcadaf9484a6e4e06ea8757dce510e3 (diff) | |
| download | fsf-binutils-gdb-10adf131a598d8a101af9e0f8eadcb3a935eb943.zip fsf-binutils-gdb-10adf131a598d8a101af9e0f8eadcb3a935eb943.tar.gz fsf-binutils-gdb-10adf131a598d8a101af9e0f8eadcb3a935eb943.tar.bz2 | |
* 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.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/bfd/archive.c b/bfd/archive.c index da25f60..4473975 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; |