* readelf.c (get_machine_flags): Add detection of EF_MIPS_32BITMODE.

[binutils-gdb.git] / bfd / binary.c

diff --git a/bfd/binary.c b/bfd/binary.c
index b5b2fad3fbc7b1d74dbbe2ba2055bba643f945de..7fd01b3718937ed03f31dd7a53c3ab134af2d27f 100644 (file)
--- a/bfd/binary.c
+++ b/bfd/binary.c
@@ -1,5 +1,6 @@
 /* BFD back-end for binary objects.
-   Copyright 1994, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -54,6 +55,10 @@ 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
@@ -100,6 +105,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;
 }
 
@@ -255,6 +267,9 @@ binary_set_section_contents (abfd, sec, data, offset, size)
      file_ptr offset;
      bfd_size_type size;
 {
+  if (size == 0)
+    return true;
+
   if (! abfd->output_has_begun)
     {
       boolean found_low;
@@ -270,6 +285,7 @@ binary_set_section_contents (abfd, sec, data, offset, size)
        if (((s->flags
              & (SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC | SEC_NEVER_LOAD))
             == (SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC))
+           && (s->_raw_size > 0)
            && (! found_low || s->lma < low))
          {
            low = s->lma;
@@ -281,17 +297,18 @@ binary_set_section_contents (abfd, sec, data, offset, size)
          s->filepos = s->lma - low;
 
          /* Skip following warning check for sections that will not
-            occupy file space.  */ 
+            occupy file space.  */
          if ((s->flags
               & (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_NEVER_LOAD))
-             != (SEC_HAS_CONTENTS | SEC_ALLOC))
+             != (SEC_HAS_CONTENTS | SEC_ALLOC)
+             || (s->_raw_size == 0))
            continue;
 
          /* If attempting to generate a binary file from a bfd with
             LMA's all over the place, huge (sparse?) binary files may
             result.  This condition attempts to detect this situation
             and print a warning.  Better heuristics would be nice to
-            have. */
+            have.  */
 
          if (s->filepos < 0)
            (*_bfd_error_handler)
@@ -328,6 +345,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
@@ -382,5 +400,7 @@ const bfd_target binary_vec =
   BFD_JUMP_TABLE_LINK (binary),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
+  NULL,
+
   NULL
 };