diff options
Diffstat (limited to 'contrib/binutils/bfd/binary.c')
| -rw-r--r-- | contrib/binutils/bfd/binary.c | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/contrib/binutils/bfd/binary.c b/contrib/binutils/bfd/binary.c index b80343b..705ac8f 100644 --- a/contrib/binutils/bfd/binary.c +++ b/contrib/binutils/bfd/binary.c @@ -1,5 +1,5 @@ /* BFD back-end for binary objects. - Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 + Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com> @@ -32,10 +32,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ the file. objcopy cooperates by specially setting the start address to zero by default. */ -#include <ctype.h> - #include "bfd.h" #include "sysdep.h" +#include "safe-ctype.h" #include "libbfd.h" /* Any bfd we create by reading a binary file has three symbols: @@ -49,12 +48,15 @@ static boolean binary_get_section_contents static long binary_get_symtab_upper_bound PARAMS ((bfd *)); static char *mangle_name PARAMS ((bfd *, char *)); static long binary_get_symtab PARAMS ((bfd *, asymbol **)); -static asymbol *binary_make_empty_symbol PARAMS ((bfd *)); static void binary_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); static boolean binary_set_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); static int binary_sizeof_headers PARAMS ((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; + /* Create a binary object. Invoked via bfd_set_format. */ static boolean @@ -101,6 +103,13 @@ binary_object_p (abfd) abfd->tdata.any = (PTR) sec; + if (bfd_get_arch_info (abfd) != NULL) + { + 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)); + } + return abfd->xvec; } @@ -119,7 +128,7 @@ binary_get_section_contents (abfd, section, location, offset, count) bfd_size_type count; { if (bfd_seek (abfd, offset, SEEK_SET) != 0 - || bfd_read (location, 1, count, abfd) != count) + || bfd_bread (location, count, abfd) != count) return false; return true; } @@ -140,7 +149,7 @@ mangle_name (abfd, suffix) bfd *abfd; char *suffix; { - int size; + bfd_size_type size; char *buf; char *p; @@ -156,7 +165,7 @@ mangle_name (abfd, suffix) /* Change any non-alphanumeric characters to underscores. */ for (p = buf; *p; p++) - if (! isalnum ((unsigned char) *p)) + if (! ISALNUM (*p)) *p = '_'; return buf; @@ -172,8 +181,9 @@ binary_get_symtab (abfd, alocation) asection *sec = (asection *) abfd->tdata.any; asymbol *syms; unsigned int i; + bfd_size_type amt = BIN_SYMS * sizeof (asymbol); - syms = (asymbol *) bfd_alloc (abfd, BIN_SYMS * sizeof (asymbol)); + syms = (asymbol *) bfd_alloc (abfd, amt); if (syms == NULL) return false; @@ -208,15 +218,7 @@ binary_get_symtab (abfd, alocation) return BIN_SYMS; } -/* Make an empty symbol. */ - -static asymbol * -binary_make_empty_symbol (abfd) - bfd *abfd; -{ - return (asymbol *) bfd_alloc (abfd, sizeof (asymbol)); -} - +#define binary_make_empty_symbol _bfd_generic_make_empty_symbol #define binary_print_symbol _bfd_nosymbols_print_symbol /* Get information about a symbol. */ @@ -334,6 +336,7 @@ binary_sizeof_headers (abfd, exec) bfd_generic_get_relocated_section_contents #define binary_bfd_relax_section bfd_generic_relax_section #define binary_bfd_gc_sections bfd_generic_gc_sections +#define binary_bfd_merge_sections bfd_generic_merge_sections #define binary_bfd_link_hash_table_create _bfd_generic_link_hash_table_create #define binary_bfd_link_add_symbols _bfd_generic_link_add_symbols #define binary_bfd_final_link _bfd_generic_final_link |
