From b749473bc4c4e05436f3b07d464b0a172af761cf Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 21 Oct 2003 14:08:12 +0000 Subject: [PATCH] Set the machine number as well as the architecture when converting from a binary file to another file type. --- bfd/ChangeLog | 5 +++++ bfd/binary.c | 37 ++++++++++++++++++++----------------- binutils/ChangeLog | 5 +++++ binutils/objcopy.c | 11 ++++++++--- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7ae6b66aa5c..85f71748eb1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Anil Paranjpe + + * binary.c (binary_object_p): Pass machine flag along with + architecture. + 2003-10-21 Thorsten Brehm * archures.c (bfd_default_scan): Add support for mcf528x. diff --git a/bfd/binary.c b/bfd/binary.c index 054a57923f1..a6a780e3867 100644 --- a/bfd/binary.c +++ b/bfd/binary.c @@ -1,23 +1,24 @@ /* BFD back-end for binary objects. - Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support, -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This is a BFD backend which may be used to write binary objects. It may only be used for output, not input. The intention is that @@ -53,9 +54,10 @@ static bfd_boolean binary_set_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); static int binary_sizeof_headers PARAMS ((bfd *, bfd_boolean)); -/* Set by external programs - specifies the BFD architecture - to use when creating binary BFDs. */ -enum bfd_architecture bfd_external_binary_architecture = bfd_arch_unknown; +/* Set by external programs - specifies the BFD architecture and + machine number to be uses when creating binary BFDs. */ +enum bfd_architecture bfd_external_binary_architecture = bfd_arch_unknown; +unsigned long bfd_external_machine = 0; /* Create a binary object. Invoked via bfd_set_format. */ @@ -107,7 +109,8 @@ binary_object_p (abfd) { if ((bfd_get_arch_info (abfd)->arch == bfd_arch_unknown) && (bfd_external_binary_architecture != bfd_arch_unknown)) - bfd_set_arch_info (abfd, bfd_lookup_arch (bfd_external_binary_architecture, 0)); + bfd_set_arch_info (abfd, bfd_lookup_arch + (bfd_external_binary_architecture, bfd_external_machine)); } return abfd->xvec; diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 6ee23c4060a..02d6944b0b6 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2003-10-14 Anil Paranjpe + + * objcopy.c (copy_main): Reads machine flags from arch_info + structure. + 2003-10-20 Andrew Cagney * coffgrok.h (coff_section): Replace 'struct sec" with "struct diff --git a/binutils/objcopy.c b/binutils/objcopy.c index c6512217f7f..b48b84ff02d 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -351,8 +351,10 @@ extern unsigned int Chunk; on by the --srec-forceS3 command line switch. */ extern bfd_boolean S3Forced; -/* Defined in bfd/binary.c. Used to set architecture of input binary files. */ -extern enum bfd_architecture bfd_external_binary_architecture; +/* Defined in bfd/binary.c. Used to set architecture and machine of input + binary files. */ +extern enum bfd_architecture bfd_external_binary_architecture; +extern unsigned long bfd_external_machine; /* Forward declarations. */ static void setup_section (bfd *, asection *, void *); @@ -2769,7 +2771,10 @@ copy_main (int argc, char *argv[]) temp_arch_info = bfd_scan_arch (binary_architecture); if (temp_arch_info != NULL) - bfd_external_binary_architecture = temp_arch_info->arch; + { + bfd_external_binary_architecture = temp_arch_info->arch; + bfd_external_machine = temp_arch_info->mach; + } else fatal (_("architecture %s unknown"), binary_architecture); } -- 2.30.2