mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-25 19:14:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

* coffcode.h (coff_sym_filepos): Remove GNU960 conditional code.

Browse Source 
* format.c (bfd_check_format_matches): Likewise.
	* archive.c (BFD_GNU960_ARMAG): Likewise.
	(bfd_generic_archive_p): Likewise.
	(_bfd_write_archive_contents): Likewise.
This commit is contained in:
Ben Elliston 2005-02-24 20:16:56 +00:00
parent 0ef622cbcf
commit 10adf131a5
4 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2005-02-24 Ben Elliston <bje@au.ibm.com>
* 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.
2005-02-24 H.J. Lu <hongjiu.lu@intel.com>
* configure.in: (AM_INIT_AUTOMAKE): Set version to 2.15.95.

13
bfd/archive.c
View File

@ -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;

9
bfd/coffcode.h
View File

@ -5130,15 +5130,6 @@ coff_canonicalize_reloc (abfd, section, relptr, symbols)
return section->reloc_count;
}
#ifdef GNU960
file_ptr
coff_sym_filepos (abfd)
bfd *abfd;
{
return obj_sym_filepos (abfd);
}
#endif
#ifndef coff_reloc16_estimate
#define coff_reloc16_estimate dummy_reloc16_estimate

10
bfd/format.c
View File

@ -245,16 +245,6 @@ bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching)
matching_vector[match_count] = temp;
match_count++;
#ifdef GNU960
/* Big- and little-endian b.out archives look the same, but it
doesn't matter: there is no difference in their headers, and
member file byte orders will (I hope) be handled appropriately
by bfd. Ditto for big and little coff archives. And the 4
coff/b.out object formats are unambiguous. So accept the
first match we find. */
break;
#endif
}
else if ((err = bfd_get_error ()) == bfd_error_wrong_object_format
|| err == bfd_error_file_ambiguously_recognized)