* config/tc-mn10300.c (set_arch_mach): Change argument type to

[deliverable/binutils-gdb.git] / bfd / simple.c

diff --git a/bfd/simple.c b/bfd/simple.c
index 10178a40ad4cd62bead3ad5ed450673d594ee1d5..88f13370551edae5cabbdc9d877a8a1a57e124fa 100644 (file)
--- a/bfd/simple.c
+++ b/bfd/simple.c
@@ -24,28 +24,28 @@
 #include "libbfd.h"
 #include "bfdlink.h"
 
-static boolean simple_dummy_warning
+static bfd_boolean simple_dummy_warning
   PARAMS ((struct bfd_link_info *, const char *, const char *, bfd *,
           asection *, bfd_vma));
 
-static boolean simple_dummy_undefined_symbol
+static bfd_boolean simple_dummy_undefined_symbol
   PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *,
-          bfd_vma, boolean));
+          bfd_vma, bfd_boolean));
 
-static boolean simple_dummy_reloc_overflow 
+static bfd_boolean simple_dummy_reloc_overflow
   PARAMS ((struct bfd_link_info *, const char *, const char *, bfd_vma,
           bfd *, asection *, bfd_vma));
 
-static boolean simple_dummy_reloc_dangerous
+static bfd_boolean simple_dummy_reloc_dangerous
   PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
 
-static boolean simple_dummy_unattached_reloc
+static bfd_boolean simple_dummy_unattached_reloc
   PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
 
 bfd_byte * bfd_simple_get_relocated_section_contents
   PARAMS ((bfd *, asection *, bfd_byte *));
 
-static boolean
+static bfd_boolean
 simple_dummy_warning (link_info, warning, symbol, abfd, section, address)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      const char *warning ATTRIBUTE_UNUSED;
@@ -54,22 +54,22 @@ simple_dummy_warning (link_info, warning, symbol, abfd, section, address)
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 simple_dummy_undefined_symbol (link_info, name, abfd, section, address, fatal)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
-     boolean fatal ATTRIBUTE_UNUSED;
+     bfd_boolean fatal ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 simple_dummy_reloc_overflow (link_info, name, reloc_name, addend, abfd,
                             section, address)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
@@ -80,10 +80,10 @@ simple_dummy_reloc_overflow (link_info, name, reloc_name, addend, abfd,
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 simple_dummy_reloc_dangerous (link_info, message, abfd, section, address)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      const char *message ATTRIBUTE_UNUSED;
@@ -91,10 +91,10 @@ simple_dummy_reloc_dangerous (link_info, message, abfd, section, address)
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 simple_dummy_unattached_reloc (link_info, name, abfd, section, address)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
@@ -102,7 +102,7 @@ simple_dummy_unattached_reloc (link_info, name, abfd, section, address)
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /*
@@ -138,6 +138,21 @@ bfd_simple_get_relocated_section_contents (abfd, sec, outbuf)
   int storage_needed, number_of_symbols;
   asymbol **symbol_table;
 
+  if (! (sec->flags & SEC_RELOC))
+    {
+      bfd_size_type size = bfd_section_size (abfd, sec);
+
+      if (outbuf == NULL)
+       contents = bfd_malloc (size);
+      else
+       contents = outbuf;
+
+      if (contents)
+       bfd_get_section_contents (abfd, sec, contents, 0, size);
+
+      return contents;
+    }
+
   /* In order to use bfd_get_relocated_section_contents, we need
      to forge some data structures that it expects.  */