From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8615 invoked by alias); 24 Feb 2005 05:41:08 -0000 Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sources.redhat.com Received: (qmail 7966 invoked from network); 24 Feb 2005 05:41:02 -0000 Received: from unknown (HELO ausmtp01.au.ibm.com) (202.81.18.186) by sourceware.org with SMTP; 24 Feb 2005 05:41:02 -0000 Received: from sd0208e0.au.ibm.com (d23rh904.au.ibm.com [202.81.18.202]) by ausmtp01.au.ibm.com (8.12.10/8.12.10) with ESMTP id j1O5glTV179278 for ; Thu, 24 Feb 2005 16:42:47 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.250.243]) by sd0208e0.au.ibm.com (8.12.10/NCO/VER6.6) with ESMTP id j1O5hK3j110304 for ; Thu, 24 Feb 2005 16:43:20 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.12.11/8.12.11) with ESMTP id j1O5exQx032708 for ; Thu, 24 Feb 2005 16:40:59 +1100 Received: from ozlabs.au.ibm.com (haven.au.ibm.com [9.190.164.82]) by d23av02.au.ibm.com (8.12.11/8.12.11) with ESMTP id j1O5exbV032687 for ; Thu, 24 Feb 2005 16:40:59 +1100 Received: from [127.0.0.1] (localhost [127.0.0.1]) by ozlabs.au.ibm.com (Postfix) with ESMTP id E38D617DDA for ; Thu, 24 Feb 2005 16:40:58 +1100 (EST) Message-ID: <421D6962.8020200@au.ibm.com> Date: Thu, 24 Feb 2005 14:45:00 -0000 From: Ben Elliston User-Agent: Debian Thunderbird 1.0 (X11/20050116) MIME-Version: 1.0 To: binutils@sources.redhat.com Subject: remove GNU960 conditional code in bfd Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig2C69CE762AAC12E60D2AFA6C" X-SW-Source: 2005-02/txt/msg00582.txt.bz2 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2C69CE762AAC12E60D2AFA6C Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 3293 Likewise for bfd. Okay for mainline? 2005-02-24 Ben Elliston * 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. Index: coffcode.h =================================================================== RCS file: /home/bje/src-cvs/src/bfd/coffcode.h,v retrieving revision 1.118 diff -u -p -r1.118 coffcode.h --- coffcode.h 22 Feb 2005 00:50:04 -0000 1.118 +++ coffcode.h 24 Feb 2005 05:38:59 -0000 @@ -5128,15 +5128,6 @@ coff_canonicalize_reloc (abfd, section, 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 Index: format.c =================================================================== RCS file: /home/bje/src-cvs/src/bfd/format.c,v retrieving revision 1.16 diff -u -p -r1.16 format.c --- format.c 30 Nov 2003 18:40:41 -0000 1.16 +++ format.c 24 Feb 2005 05:38:59 -0000 @@ -245,16 +245,6 @@ bfd_check_format_matches (bfd *abfd, bfd 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) Index: archive.c =================================================================== RCS file: /home/bje/src-cvs/src/bfd/archive.c,v retrieving revision 1.32 diff -u -p -r1.32 archive.c --- archive.c 31 Jan 2005 23:13:14 -0000 1.32 +++ archive.c 24 Feb 2005 05:38:59 -0000 @@ -133,15 +133,12 @@ DESCRIPTION #include "aout/ar.h" #include "aout/ranlib.h" #include "safe-ctype.h" #ifndef errno 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 +598,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 +1664,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; --------------enig2C69CE762AAC12E60D2AFA6C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" Content-length: 256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCHWliMGpskFPkywkRAndbAJ9yoKRsjG/ePUuaGzfdIUKikvXdYACgwUS8 wKJW7qD+E/8C6nbdEq+R12w= =pNnU -----END PGP SIGNATURE----- --------------enig2C69CE762AAC12E60D2AFA6C--