[ARC] Fixes related to reordering of .got and .got.plt

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

diff --git a/bfd/binary.c b/bfd/binary.c
index a6a780e3867df596d3ab3a4a72748a86214356d6..2223b5d2dfc5b2e4fb10a607f7070660d22d6818 100644 (file)
--- a/bfd/binary.c
+++ b/bfd/binary.c
@@ -1,14 +1,12 @@
 /* BFD back-end for binary objects.
 /* BFD back-end for binary objects.

-   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003
-   Free Software Foundation, Inc.
+   Copyright (C) 1994-2016 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.
 
    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
    Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>
 
    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
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,7 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, 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
 
 /* 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


@@ -33,8 +32,8 @@
    the file.  objcopy cooperates by specially setting the start
    address to zero by default.  */
 
    the file.  objcopy cooperates by specially setting the start
    address to zero by default.  */
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "safe-ctype.h"
 #include "libbfd.h"
 
 #include "safe-ctype.h"
 #include "libbfd.h"
 


@@ -42,28 +41,10 @@
    a start symbol, an end symbol, and an absolute length symbol.  */
 #define BIN_SYMS 3
 
    a start symbol, an end symbol, and an absolute length symbol.  */
 #define BIN_SYMS 3
 

-static bfd_boolean binary_mkobject PARAMS ((bfd *));
-static const bfd_target *binary_object_p PARAMS ((bfd *));
-static bfd_boolean binary_get_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static long binary_get_symtab_upper_bound PARAMS ((bfd *));
-static char *mangle_name PARAMS ((bfd *, char *));
-static long binary_canonicalize_symtab PARAMS ((bfd *, asymbol **));
-static void binary_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-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 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.  */
 
 static bfd_boolean
 /* Create a binary object.  Invoked via bfd_set_format.  */
 
 static bfd_boolean

-binary_mkobject (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+binary_mkobject (bfd *abfd ATTRIBUTE_UNUSED)

 {
   return TRUE;
 }
 {
   return TRUE;
 }


@@ -73,11 +54,11 @@ binary_mkobject (abfd)
    being binary.  */
 
 static const bfd_target *
    being binary.  */
 
 static const bfd_target *

-binary_object_p (abfd)
-     bfd *abfd;
+binary_object_p (bfd *abfd)

 {
   struct stat statbuf;
   asection *sec;
 {
   struct stat statbuf;
   asection *sec;

+  flagword flags;

 
   if (abfd->target_defaulted)
     {
 
   if (abfd->target_defaulted)
     {


@@ -95,40 +76,31 @@ binary_object_p (abfd)
     }
 
   /* One data section.  */
     }
 
   /* One data section.  */

-  sec = bfd_make_section (abfd, ".data");
+  flags = SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS;
+  sec = bfd_make_section_with_flags (abfd, ".data", flags);

   if (sec == NULL)
     return NULL;
   if (sec == NULL)
     return NULL;

-  sec->flags = SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS;

   sec->vma = 0;
   sec->vma = 0;

-  sec->_raw_size = statbuf.st_size;
+  sec->size = statbuf.st_size;

   sec->filepos = 0;
 
   sec->filepos = 0;
 

-  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, bfd_external_machine));
-    }
+  abfd->tdata.any = (void *) sec;

 
   return abfd->xvec;
 }
 
 
   return abfd->xvec;
 }
 

-#define binary_close_and_cleanup _bfd_generic_close_and_cleanup
-#define binary_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define binary_new_section_hook _bfd_generic_new_section_hook
+#define binary_close_and_cleanup     _bfd_generic_close_and_cleanup
+#define binary_bfd_free_cached_info  _bfd_generic_bfd_free_cached_info
+#define binary_new_section_hook      _bfd_generic_new_section_hook

 
 /* Get contents of the only section.  */
 
 static bfd_boolean
 
 /* Get contents of the only section.  */
 
 static bfd_boolean

-binary_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section ATTRIBUTE_UNUSED;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+binary_get_section_contents (bfd *abfd,
+                            asection *section ATTRIBUTE_UNUSED,
+                            void * location,
+                            file_ptr offset,
+                            bfd_size_type count)

 {
   if (bfd_seek (abfd, offset, SEEK_SET) != 0
       || bfd_bread (location, count, abfd) != count)
 {
   if (bfd_seek (abfd, offset, SEEK_SET) != 0
       || bfd_bread (location, count, abfd) != count)


@@ -139,8 +111,7 @@ binary_get_section_contents (abfd, section, location, offset, count)
 /* Return the amount of memory needed to read the symbol table.  */
 
 static long
 /* Return the amount of memory needed to read the symbol table.  */
 
 static long

-binary_get_symtab_upper_bound (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+binary_get_symtab_upper_bound (bfd *abfd ATTRIBUTE_UNUSED)

 {
   return (BIN_SYMS + 1) * sizeof (asymbol *);
 }
 {
   return (BIN_SYMS + 1) * sizeof (asymbol *);
 }


@@ -148,9 +119,7 @@ binary_get_symtab_upper_bound (abfd)
 /* Create a symbol name based on the bfd's filename.  */
 
 static char *
 /* Create a symbol name based on the bfd's filename.  */
 
 static char *

-mangle_name (abfd, suffix)
-     bfd *abfd;
-     char *suffix;
+mangle_name (bfd *abfd, char *suffix)

 {
   bfd_size_type size;
   char *buf;
 {
   bfd_size_type size;
   char *buf;


@@ -177,9 +146,7 @@ mangle_name (abfd, suffix)
 /* Return the symbol table.  */
 
 static long
 /* Return the symbol table.  */
 
 static long

-binary_canonicalize_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
+binary_canonicalize_symtab (bfd *abfd, asymbol **alocation)

 {
   asection *sec = (asection *) abfd->tdata.any;
   asymbol *syms;
 {
   asection *sec = (asection *) abfd->tdata.any;
   asymbol *syms;


@@ -188,7 +155,7 @@ binary_canonicalize_symtab (abfd, alocation)
 
   syms = (asymbol *) bfd_alloc (abfd, amt);
   if (syms == NULL)
 
   syms = (asymbol *) bfd_alloc (abfd, amt);
   if (syms == NULL)

-    return 0;
+    return -1;

 
   /* Start symbol.  */
   syms[0].the_bfd = abfd;
 
   /* Start symbol.  */
   syms[0].the_bfd = abfd;


@@ -201,7 +168,7 @@ binary_canonicalize_symtab (abfd, alocation)
   /* End symbol.  */
   syms[1].the_bfd = abfd;
   syms[1].name = mangle_name (abfd, "end");
   /* End symbol.  */
   syms[1].the_bfd = abfd;
   syms[1].name = mangle_name (abfd, "end");

-  syms[1].value = sec->_raw_size;
+  syms[1].value = sec->size;

   syms[1].flags = BSF_GLOBAL;
   syms[1].section = sec;
   syms[1].udata.p = NULL;
   syms[1].flags = BSF_GLOBAL;
   syms[1].section = sec;
   syms[1].udata.p = NULL;


@@ -209,7 +176,7 @@ binary_canonicalize_symtab (abfd, alocation)
   /* Size symbol.  */
   syms[2].the_bfd = abfd;
   syms[2].name = mangle_name (abfd, "size");
   /* Size symbol.  */
   syms[2].the_bfd = abfd;
   syms[2].name = mangle_name (abfd, "size");

-  syms[2].value = sec->_raw_size;
+  syms[2].value = sec->size;

   syms[2].flags = BSF_GLOBAL;
   syms[2].section = bfd_abs_section_ptr;
   syms[2].udata.p = NULL;
   syms[2].flags = BSF_GLOBAL;
   syms[2].section = bfd_abs_section_ptr;
   syms[2].udata.p = NULL;


@@ -221,32 +188,30 @@ binary_canonicalize_symtab (abfd, alocation)
   return BIN_SYMS;
 }
 
   return BIN_SYMS;
 }
 

-#define binary_make_empty_symbol _bfd_generic_make_empty_symbol
-#define binary_print_symbol _bfd_nosymbols_print_symbol
+#define binary_make_empty_symbol  _bfd_generic_make_empty_symbol
+#define binary_print_symbol       _bfd_nosymbols_print_symbol
+#define binary_get_symbol_version_string \
+  _bfd_nosymbols_get_symbol_version_string

 
 /* Get information about a symbol.  */
 
 static void
 
 /* Get information about a symbol.  */
 
 static void

-binary_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     asymbol *symbol;
-     symbol_info *ret;
+binary_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+                       asymbol *symbol,
+                       symbol_info *ret)

 {
   bfd_symbol_info (symbol, ret);
 }
 
 {
   bfd_symbol_info (symbol, ret);
 }
 

-#define binary_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define binary_get_lineno _bfd_nosymbols_get_lineno
-#define binary_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define binary_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define binary_read_minisymbols _bfd_generic_read_minisymbols
-#define binary_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define binary_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) bfd_0l)
-#define binary_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
-#define binary_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
+#define binary_bfd_is_local_label_name      bfd_generic_is_local_label_name
+#define binary_get_lineno                  _bfd_nosymbols_get_lineno
+#define binary_find_nearest_line           _bfd_nosymbols_find_nearest_line
+#define binary_find_line                   _bfd_nosymbols_find_line
+#define binary_find_inliner_info           _bfd_nosymbols_find_inliner_info
+#define binary_bfd_make_debug_symbol       _bfd_nosymbols_bfd_make_debug_symbol
+#define binary_read_minisymbols            _bfd_generic_read_minisymbols
+#define binary_minisymbol_to_symbol        _bfd_generic_minisymbol_to_symbol
+#define binary_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)

 
 /* Set the architecture of a binary file.  */
 #define binary_set_arch_mach _bfd_generic_set_arch_mach
 
 /* Set the architecture of a binary file.  */
 #define binary_set_arch_mach _bfd_generic_set_arch_mach


@@ -254,12 +219,11 @@ binary_get_symbol_info (ignore_abfd, symbol, ret)
 /* Write section contents of a binary file.  */
 
 static bfd_boolean
 /* Write section contents of a binary file.  */
 
 static bfd_boolean

-binary_set_section_contents (abfd, sec, data, offset, size)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-     file_ptr offset;
-     bfd_size_type size;
+binary_set_section_contents (bfd *abfd,
+                            asection *sec,
+                            const void * data,
+                            file_ptr offset,
+                            bfd_size_type size)

 {
   if (size == 0)
     return TRUE;
 {
   if (size == 0)
     return TRUE;


@@ -279,7 +243,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))
        if (((s->flags
              & (SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC | SEC_NEVER_LOAD))
             == (SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC))

-           && (s->_raw_size > 0)
+           && (s->size > 0)

            && (! found_low || s->lma < low))
          {
            low = s->lma;
            && (! found_low || s->lma < low))
          {
            low = s->lma;


@@ -295,7 +259,7 @@ binary_set_section_contents (abfd, sec, data, offset, size)
          if ((s->flags
               & (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_NEVER_LOAD))
              != (SEC_HAS_CONTENTS | SEC_ALLOC)
          if ((s->flags
               & (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_NEVER_LOAD))
              != (SEC_HAS_CONTENTS | SEC_ALLOC)

-             || (s->_raw_size == 0))
+             || (s->size == 0))

            continue;
 
          /* If attempting to generate a binary file from a bfd with
            continue;
 
          /* If attempting to generate a binary file from a bfd with


@@ -328,27 +292,29 @@ binary_set_section_contents (abfd, sec, data, offset, size)
 /* No space is required for header information.  */
 
 static int
 /* No space is required for header information.  */
 
 static int

-binary_sizeof_headers (abfd, exec)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_boolean exec ATTRIBUTE_UNUSED;
+binary_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+                      struct bfd_link_info *info ATTRIBUTE_UNUSED)

 {
   return 0;
 }
 
 {
   return 0;
 }
 

-#define binary_bfd_get_relocated_section_contents \
-  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_discard_group bfd_generic_discard_group
-#define binary_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define binary_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
-#define binary_bfd_link_just_syms _bfd_generic_link_just_syms
-#define binary_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define binary_bfd_final_link _bfd_generic_final_link
-#define binary_bfd_link_split_section _bfd_generic_link_split_section
-#define binary_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
+#define binary_bfd_get_relocated_section_contents  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_lookup_section_flags            bfd_generic_lookup_section_flags
+#define binary_bfd_merge_sections                  bfd_generic_merge_sections
+#define binary_bfd_is_group_section                bfd_generic_is_group_section
+#define binary_bfd_discard_group                   bfd_generic_discard_group
+#define binary_section_already_linked             _bfd_generic_section_already_linked
+#define binary_bfd_define_common_symbol            bfd_generic_define_common_symbol
+#define binary_bfd_link_hash_table_create         _bfd_generic_link_hash_table_create
+#define binary_bfd_link_just_syms                 _bfd_generic_link_just_syms
+#define binary_bfd_copy_link_hash_symbol_type     _bfd_generic_copy_link_hash_symbol_type
+#define binary_bfd_link_add_symbols               _bfd_generic_link_add_symbols
+#define binary_bfd_final_link                     _bfd_generic_final_link
+#define binary_bfd_link_split_section             _bfd_generic_link_split_section
+#define binary_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
+#define binary_bfd_link_check_relocs              _bfd_generic_link_check_relocs

 
 const bfd_target binary_vec =
 {
 
 const bfd_target binary_vec =
 {


@@ -362,6 +328,7 @@ const bfd_target binary_vec =
   0,                           /* symbol_leading_char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */
   0,                           /* symbol_leading_char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */

+  255,                         /* match priority.  */

   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* data */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* data */


@@ -370,7 +337,7 @@ const bfd_target binary_vec =
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* hdrs */
   {                            /* bfd_check_format */
     _bfd_dummy_target,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* hdrs */
   {                            /* bfd_check_format */
     _bfd_dummy_target,

-    binary_object_p,           /* bfd_check_format */
+    binary_object_p,

     _bfd_dummy_target,
     _bfd_dummy_target,
   },
     _bfd_dummy_target,
     _bfd_dummy_target,
   },


@@ -392,7 +359,7 @@ const bfd_target binary_vec =
   BFD_JUMP_TABLE_CORE (_bfd_nocore),
   BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
   BFD_JUMP_TABLE_SYMBOLS (binary),
   BFD_JUMP_TABLE_CORE (_bfd_nocore),
   BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
   BFD_JUMP_TABLE_SYMBOLS (binary),

-  BFD_JUMP_TABLE_RELOCS (binary),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),

   BFD_JUMP_TABLE_WRITE (binary),
   BFD_JUMP_TABLE_LINK (binary),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
   BFD_JUMP_TABLE_WRITE (binary),
   BFD_JUMP_TABLE_LINK (binary),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),