* elf-hppa.h (elf_hppa_reloc_final_type): Handle R_PARISC_GPREL64,

[deliverable/binutils-gdb.git] / bfd / elf32-sh64.c

diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index 288003e0660410b911ace44f7e30cc00d969bbfd..3de856265be896d4a17d3fe2160195fbab1ec827 100644 (file)
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -1,11 +1,12 @@
 /* SuperH SH64-specific support for 32-bit ELF
 /* SuperH SH64-specific support for 32-bit ELF

-   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.

 
    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
 
    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,


@@ -15,12 +16,13 @@
 
    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.  */

 
 #define SH64_ELF
 
 
 #define SH64_ELF
 

-#include "bfd.h"

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

+#include "bfd.h"

 #include "elf-bfd.h"
 #include "../opcodes/sh64-opc.h"
 #include "elf32-sh64.h"
 #include "elf-bfd.h"
 #include "../opcodes/sh64-opc.h"
 #include "elf32-sh64.h"


@@ -56,13 +58,13 @@ static bfd_boolean shmedia_prepare_reloc
 static int sh64_elf_get_symbol_type
   (Elf_Internal_Sym *, int);
 static bfd_boolean sh64_elf_add_symbol_hook
 static int sh64_elf_get_symbol_type
   (Elf_Internal_Sym *, int);
 static bfd_boolean sh64_elf_add_symbol_hook

-  (bfd *, struct bfd_link_info *, const Elf_Internal_Sym *, const char **,
+  (bfd *, struct bfd_link_info *, Elf_Internal_Sym *, const char **,

    flagword *, asection **, bfd_vma *);
 static bfd_boolean sh64_elf_link_output_symbol_hook
    flagword *, asection **, bfd_vma *);
 static bfd_boolean sh64_elf_link_output_symbol_hook

-  (bfd *, struct bfd_link_info *, const char *, Elf_Internal_Sym *,
-   asection *);
+  (struct bfd_link_info *, const char *, Elf_Internal_Sym *, asection *,
+   struct elf_link_hash_entry *);

 static bfd_boolean sh64_backend_section_from_shdr
 static bfd_boolean sh64_backend_section_from_shdr

-  (bfd *, Elf_Internal_Shdr *, const char *);
+  (bfd *, Elf_Internal_Shdr *, const char *, int);

 static void sh64_elf_final_write_processing
   (bfd *, bfd_boolean);
 static bfd_boolean sh64_bfd_elf_copy_private_section_data
 static void sh64_elf_final_write_processing
   (bfd *, bfd_boolean);
 static bfd_boolean sh64_bfd_elf_copy_private_section_data


@@ -85,9 +87,11 @@ static void sh64_find_section_for_address
 #define elf_backend_add_symbol_hook            sh64_elf_add_symbol_hook
 #define elf_backend_link_output_symbol_hook \
        sh64_elf_link_output_symbol_hook
 #define elf_backend_add_symbol_hook            sh64_elf_add_symbol_hook
 #define elf_backend_link_output_symbol_hook \
        sh64_elf_link_output_symbol_hook

+#define elf_backend_merge_symbol_attribute     sh64_elf_merge_symbol_attribute

 #define elf_backend_final_write_processing     sh64_elf_final_write_processing
 #define elf_backend_section_from_shdr          sh64_backend_section_from_shdr
 #define elf_backend_special_sections           sh64_elf_special_sections
 #define elf_backend_final_write_processing     sh64_elf_final_write_processing
 #define elf_backend_section_from_shdr          sh64_backend_section_from_shdr
 #define elf_backend_special_sections           sh64_elf_special_sections

+#define elf_backend_section_flags              sh64_elf_section_flags

 
 #define bfd_elf32_new_section_hook             sh64_elf_new_section_hook
 
 
 #define bfd_elf32_new_section_hook             sh64_elf_new_section_hook
 


@@ -104,6 +108,7 @@ static void sh64_find_section_for_address
 
 #define GOT_BIAS (-((long)-32768))
 #define INCLUDE_SHMEDIA
 
 #define GOT_BIAS (-((long)-32768))
 #define INCLUDE_SHMEDIA

+#define SH_TARGET_ALREADY_DEFINED

 #include "elf32-sh.c"
 
 /* Tack some extra info on struct bfd_elf_section_data.  */
 #include "elf32-sh.c"
 
 /* Tack some extra info on struct bfd_elf_section_data.  */


@@ -111,13 +116,16 @@ static void sh64_find_section_for_address
 static bfd_boolean
 sh64_elf_new_section_hook (bfd *abfd, asection *sec)
 {
 static bfd_boolean
 sh64_elf_new_section_hook (bfd *abfd, asection *sec)
 {

-  struct _sh64_elf_section_data *sdata;
-  bfd_size_type amt = sizeof (*sdata);
+  if (!sec->used_by_bfd)
+    {
+      struct _sh64_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);

 
 

-  sdata = (struct _sh64_elf_section_data *) bfd_zalloc (abfd, amt);
-  if (sdata == NULL)
-    return FALSE;
-  sec->used_by_bfd = sdata;
+      sdata = bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+       return FALSE;
+      sec->used_by_bfd = sdata;
+    }

 
   return _bfd_elf_new_section_hook (abfd, sec);
 }
 
   return _bfd_elf_new_section_hook (abfd, sec);
 }


@@ -148,7 +156,6 @@ static bfd_boolean
 sh64_elf_set_mach_from_flags (bfd *abfd)
 {
   flagword flags = elf_elfheader (abfd)->e_flags;
 sh64_elf_set_mach_from_flags (bfd *abfd)
 {
   flagword flags = elf_elfheader (abfd)->e_flags;

-  asection *cranges;

 
   switch (flags & EF_SH_MACH_MASK)
     {
 
   switch (flags & EF_SH_MACH_MASK)
     {


@@ -163,18 +170,19 @@ sh64_elf_set_mach_from_flags (bfd *abfd)
       return FALSE;
     }
 
       return FALSE;
     }
 

-  /* We also need to set SEC_DEBUGGING on an incoming .cranges section.
-     We could have used elf_backend_section_flags if it had given us the
-     section name; the bfd_section member in the header argument is not
-     set at the point of the call.  FIXME: Find out whether that is by
-     undocumented design or a bug.  */
-  cranges = bfd_get_section_by_name (abfd, SH64_CRANGES_SECTION_NAME);
-  if (cranges != NULL
-      && ! bfd_set_section_flags (abfd, cranges,
-                                 bfd_get_section_flags (abfd, cranges)
-                                 | SEC_DEBUGGING))
+  return TRUE;
+}
+
+static bfd_boolean
+sh64_elf_section_flags (flagword *flags,
+                       const Elf_Internal_Shdr *hdr)
+{
+  if (hdr->bfd_section == NULL)

     return FALSE;
 
     return FALSE;
 

+  if (strcmp (hdr->bfd_section->name, SH64_CRANGES_SECTION_NAME) == 0)
+    *flags |= SEC_DEBUGGING;
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -249,13 +257,14 @@ sh64_elf_merge_private_data (bfd *ibfd, bfd *obfd)
 }
 
 /* Handle a SH64-specific section when reading an object file.  This
 }
 
 /* Handle a SH64-specific section when reading an object file.  This

-   is called when elfcode.h finds a section with an unknown type.
+   is called when bfd_section_from_shdr finds a section with an unknown
+   type.

 
    We only recognize SHT_SH5_CR_SORTED, on the .cranges section.  */
 
 bfd_boolean
 sh64_backend_section_from_shdr (bfd *abfd, Elf_Internal_Shdr *hdr,
 
    We only recognize SHT_SH5_CR_SORTED, on the .cranges section.  */
 
 bfd_boolean
 sh64_backend_section_from_shdr (bfd *abfd, Elf_Internal_Shdr *hdr,

-                               const char *name)
+                               const char *name, int shindex)

 {
   flagword flags = 0;
 
 {
   flagword flags = 0;
 


@@ -280,7 +289,7 @@ sh64_backend_section_from_shdr (bfd *abfd, Elf_Internal_Shdr *hdr,
       return FALSE;
     }
 
       return FALSE;
     }
 

-  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))

     return FALSE;
 
   if (flags
     return FALSE;
 
   if (flags


@@ -373,13 +382,13 @@ sh64_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
 
 static bfd_boolean
 sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
 
 static bfd_boolean
 sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,

-                         const Elf_Internal_Sym *sym, const char **namep,
+                         Elf_Internal_Sym *sym, const char **namep,

                          flagword *flagsp ATTRIBUTE_UNUSED,
                          asection **secp, bfd_vma *valp)
 {
   /* We want to do this for relocatable as well as final linking.  */
   if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL
                          flagword *flagsp ATTRIBUTE_UNUSED,
                          asection **secp, bfd_vma *valp)
 {
   /* We want to do this for relocatable as well as final linking.  */
   if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL

-      && info->hash->creator->flavour == bfd_target_elf_flavour)
+      && is_elf_hash_table (info->hash))

     {
       struct elf_link_hash_entry *h;
 
     {
       struct elf_link_hash_entry *h;
 


@@ -422,7 +431,7 @@ sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
            }
 
          h = (struct elf_link_hash_entry *) bh;
            }
 
          h = (struct elf_link_hash_entry *) bh;

-         h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
+         h->non_elf = 0;

          h->type = STT_DATALABEL;
        }
       else
          h->type = STT_DATALABEL;
        }
       else


@@ -469,11 +478,11 @@ sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
    DataLabel symbol.  */
 
 bfd_boolean
    DataLabel symbol.  */
 
 bfd_boolean

-sh64_elf_link_output_symbol_hook (bfd *abfd ATTRIBUTE_UNUSED,
-                                 struct bfd_link_info *info,
+sh64_elf_link_output_symbol_hook (struct bfd_link_info *info,

                                  const char *cname,
                                  Elf_Internal_Sym *sym,
                                  const char *cname,
                                  Elf_Internal_Sym *sym,

-                                 asection *input_sec ATTRIBUTE_UNUSED)
+                                 asection *input_sec ATTRIBUTE_UNUSED,
+                                 struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)

 {
   char *name = (char *) cname;
 
 {
   char *name = (char *) cname;
 


@@ -585,9 +594,9 @@ shmedia_prepare_reloc (struct bfd_link_info *info, bfd *abfd,
   if (dropped != 0)
     {
       (*_bfd_error_handler)
   if (dropped != 0)
     {
       (*_bfd_error_handler)

-       (_("%s: error: unaligned relocation type %d at %08x reloc %08x\n"),
-        bfd_get_filename (input_section->owner), ELF32_R_TYPE (rel->r_info),
-        (unsigned)rel->r_offset, (unsigned)relocation);
+       (_("%B: error: unaligned relocation type %d at %08x reloc %p\n"),
+        input_section->owner, ELF32_R_TYPE (rel->r_info),
+        (unsigned) rel->r_offset, relocation);

       return FALSE;
     }
 
       return FALSE;
     }
 


@@ -603,6 +612,7 @@ sh64_find_section_for_address (bfd *abfd ATTRIBUTE_UNUSED,
 {
   bfd_vma vma;
   bfd_size_type size;
 {
   bfd_vma vma;
   bfd_size_type size;

+

   struct sh64_find_section_vma_data *fsec_datap
     = (struct sh64_find_section_vma_data *) data;
 
   struct sh64_find_section_vma_data *fsec_datap
     = (struct sh64_find_section_vma_data *) data;
 


@@ -618,11 +628,7 @@ sh64_find_section_for_address (bfd *abfd ATTRIBUTE_UNUSED,
   if (fsec_datap->addr < vma)
     return;
 
   if (fsec_datap->addr < vma)
     return;
 

-  /* FIXME: section->reloc_done isn't set properly; a generic buglet
-     preventing us from using bfd_get_section_size_after_reloc.  */
-  size
-    = section->_cooked_size ? section->_cooked_size : section->_raw_size;
-
+  size = section->size;

   if (fsec_datap->addr >= vma + size)
     return;
 
   if (fsec_datap->addr >= vma + size)
     return;
 


@@ -653,9 +659,7 @@ sh64_elf_final_write_processing (bfd *abfd,
          = sh64_elf_section_data (cranges)->sh64_info->cranges_growth) != 0)
     {
       bfd_vma incoming_cranges_size
          = sh64_elf_section_data (cranges)->sh64_info->cranges_growth) != 0)
     {
       bfd_vma incoming_cranges_size

-       = ((cranges->_cooked_size != 0
-           ? cranges->_cooked_size : cranges->_raw_size)
-          - ld_generated_cranges_size);
+       = cranges->size - ld_generated_cranges_size;

 
       if (! bfd_set_section_contents (abfd, cranges,
                                      cranges->contents
 
       if (! bfd_set_section_contents (abfd, cranges,
                                      cranges->contents


@@ -698,9 +702,7 @@ sh64_elf_final_write_processing (bfd *abfd,
       /* If we have a .cranges section, sort the entries.  */
       if (cranges != NULL)
        {
       /* If we have a .cranges section, sort the entries.  */
       if (cranges != NULL)
        {

-         bfd_size_type cranges_size
-           = (cranges->_cooked_size != 0
-              ? cranges->_cooked_size : cranges->_raw_size);
+         bfd_size_type cranges_size = cranges->size;

 
          /* We know we always have these in memory at this time.  */
          BFD_ASSERT (cranges->contents != NULL);
 
          /* We know we always have these in memory at this time.  */
          BFD_ASSERT (cranges->contents != NULL);


@@ -735,10 +737,31 @@ sh64_elf_final_write_processing (bfd *abfd,
     }
 }
 
     }
 }
 

-static struct bfd_elf_special_section const sh64_elf_special_sections[]=
+/* Merge non visibility st_other attribute when the symbol comes from
+   a dynamic object.  */
+static void
+sh64_elf_merge_symbol_attribute (struct elf_link_hash_entry *h,
+                                const Elf_Internal_Sym *isym,
+                                bfd_boolean definition,
+                                bfd_boolean dynamic ATTRIBUTE_UNUSED)
+{
+  if ((isym->st_other & ~ELF_ST_VISIBILITY (-1)) != 0)
+    {
+      unsigned char other;
+
+      /* Take the balance of OTHER from the definition.  */
+      other = (definition ? isym->st_other : h->other);
+      other &= ~ ELF_ST_VISIBILITY (-1);
+      h->other = other | ELF_ST_VISIBILITY (h->other);
+    }
+
+  return;
+}
+
+static const struct bfd_elf_special_section sh64_elf_special_sections[] =

 {
 {

-  { ".cranges", 8, 0, SHT_PROGBITS, 0 },
-  { NULL,       0, 0, 0,            0 }
+  { STRING_COMMA_LEN (".cranges"), 0, SHT_PROGBITS, 0 },
+  { NULL,                       0, 0, 0,            0 }

 };
 
 #undef TARGET_BIG_SYM
 };
 
 #undef TARGET_BIG_SYM


@@ -763,6 +786,7 @@ static struct bfd_elf_special_section const sh64_elf_special_sections[]=
 #define        TARGET_LITTLE_NAME      "elf32-sh64l-nbsd"
 #undef ELF_MAXPAGESIZE
 #define        ELF_MAXPAGESIZE         0x10000
 #define        TARGET_LITTLE_NAME      "elf32-sh64l-nbsd"
 #undef ELF_MAXPAGESIZE
 #define        ELF_MAXPAGESIZE         0x10000

+#undef ELF_COMMONPAGESIZE

 #undef elf_symbol_leading_char
 #define        elf_symbol_leading_char 0
 #undef elf32_bed
 #undef elf_symbol_leading_char
 #define        elf_symbol_leading_char 0
 #undef elf32_bed


@@ -781,6 +805,8 @@ static struct bfd_elf_special_section const sh64_elf_special_sections[]=
 #define        TARGET_LITTLE_NAME      "elf32-sh64-linux"
 #undef elf32_bed
 #define        elf32_bed               elf32_sh64_lin_bed
 #define        TARGET_LITTLE_NAME      "elf32-sh64-linux"
 #undef elf32_bed
 #define        elf32_bed               elf32_sh64_lin_bed

+#undef ELF_COMMONPAGESIZE
+#define        ELF_COMMONPAGESIZE      0x1000

 
 #include "elf32-target.h"
 
 
 #include "elf32-target.h"