Fix simulation of MSP430's open system call.

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

diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index 844a6a43e279162f5b38786781af17a1fbb9815b..87033f77f65f4f9c6cecac1092d330c85de647aa 100644 (file)
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -1,11 +1,11 @@
-/* Hitachi SH64-specific support for 32-bit ELF
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* SuperH SH64-specific support for 32-bit ELF
+   Copyright (C) 2000-2017 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,14 +15,16 @@
 
    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 "elf-bfd.h"
 #include "../opcodes/sh64-opc.h"

+#include "elf32-sh64.h"

 
 /* Add a suffix for datalabel indirection symbols.  It must not match any
    other symbols; user symbols with or without version or other
 
 /* Add a suffix for datalabel indirection symbols.  It must not match any
    other symbols; user symbols with or without version or other


@@ -37,28 +39,37 @@ struct sh64_find_section_vma_data
    bfd_vma addr;
  };
 
    bfd_vma addr;
  };
 

-static boolean sh64_elf_copy_private_data PARAMS ((bfd *, bfd *));
-static boolean sh64_elf_merge_private_data PARAMS ((bfd *, bfd *));
-static boolean sh64_elf_fake_sections PARAMS ((bfd *, Elf_Internal_Shdr *,
-                                             asection *));
-static boolean sh64_elf_set_private_flags PARAMS ((bfd *, flagword));
-static boolean sh64_elf_set_mach_from_flags PARAMS ((bfd *));
-static boolean shmedia_prepare_reloc
-  PARAMS ((struct bfd_link_info *, bfd *, asection *,
-          bfd_byte *, const Elf_Internal_Rela *, bfd_vma *));
-static int sh64_elf_get_symbol_type PARAMS ((Elf_Internal_Sym *, int));
-static boolean sh64_elf_add_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
-          const char **, flagword *, asection **, bfd_vma *));
-static boolean sh64_elf_link_output_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, Elf_Internal_Sym *,
-          asection *));
-static boolean sh64_backend_section_from_shdr
-  PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
-static void sh64_elf_final_write_processing PARAMS ((bfd *, boolean));
-static boolean sh64_bfd_elf_copy_private_section_data
-  PARAMS ((bfd *, asection *, bfd *, asection *));
-static void sh64_find_section_for_address PARAMS ((bfd *, asection *, PTR));
+static bfd_boolean sh64_elf_new_section_hook
+  (bfd *, asection *);
+static bfd_boolean sh64_elf_copy_private_data
+  (bfd *, bfd *);
+static bfd_boolean sh64_elf_merge_private_data
+  (bfd *, struct bfd_link_info *);
+static bfd_boolean sh64_elf_fake_sections
+  (bfd *, Elf_Internal_Shdr *, asection *);
+static bfd_boolean sh64_elf_set_private_flags
+  (bfd *, flagword);
+static bfd_boolean sh64_elf_set_mach_from_flags
+  (bfd *);
+static bfd_boolean shmedia_prepare_reloc
+  (struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   const Elf_Internal_Rela *, bfd_vma *);
+static int sh64_elf_get_symbol_type
+  (Elf_Internal_Sym *, int);
+static bfd_boolean sh64_elf_add_symbol_hook
+  (bfd *, struct bfd_link_info *, Elf_Internal_Sym *, const char **,
+   flagword *, asection **, bfd_vma *);
+static int sh64_elf_link_output_symbol_hook
+  (struct bfd_link_info *, const char *, Elf_Internal_Sym *, asection *,
+   struct elf_link_hash_entry *);
+static bfd_boolean sh64_backend_section_from_shdr
+  (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
+  (bfd *, asection *, bfd *, asection *);
+static void sh64_find_section_for_address
+  (bfd *, asection *, void *);

 
 /* Let elf32-sh.c handle the "bfd_" definitions, so we only have to
    intrude with an #ifndef around the function definition.  */
 
 /* Let elf32-sh.c handle the "bfd_" definitions, so we only have to
    intrude with an #ifndef around the function definition.  */


@@ -75,8 +86,13 @@ static void sh64_find_section_for_address PARAMS ((bfd *, asection *, PTR));
 #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_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

 
 /* For objcopy, we need to set up sh64_elf_section_data (asection *) from
    incoming section flags.  This is otherwise done in sh64elf.em when
 
 /* For objcopy, we need to set up sh64_elf_section_data (asection *) from
    incoming section flags.  This is otherwise done in sh64elf.em when


@@ -85,38 +101,46 @@ static void sh64_find_section_for_address PARAMS ((bfd *, asection *, PTR));
        sh64_bfd_elf_copy_private_section_data
 
 /* This COFF-only function (only compiled with COFF support, making
        sh64_bfd_elf_copy_private_section_data
 
 /* This COFF-only function (only compiled with COFF support, making

-   ELF-only chains problematic) returns true early for SH4, so let's just
-   define it true here.  */
-#define _bfd_sh_align_load_span(a,b,c,d,e,f,g,h,i,j) true
-
-#ifndef ELF_ARCH
-#define TARGET_BIG_SYM         bfd_elf32_sh64_vec
-#define TARGET_BIG_NAME                "elf32-sh64"
-#define TARGET_LITTLE_SYM      bfd_elf32_sh64l_vec
-#define TARGET_LITTLE_NAME     "elf32-sh64l"
-#define ELF_ARCH               bfd_arch_sh
-#define ELF_MACHINE_CODE       EM_SH
-#define ELF_MAXPAGESIZE                128
-
-#define elf_symbol_leading_char '_'
-#endif /* ELF_ARCH */
+   ELF-only chains problematic) returns TRUE early for SH4, so let's just
+   define it TRUE here.  */
+#define _bfd_sh_align_load_span(a,b,c,d,e,f,g,h,i,j) \
+  ((void) f, (void) h, (void) i, TRUE)

 
 #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"
 
 #include "elf32-sh.c"
 

+/* Tack some extra info on struct bfd_elf_section_data.  */
+
+static bfd_boolean
+sh64_elf_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (!sec->used_by_bfd)
+    {
+      struct _sh64_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+       return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+

 /* Set the SHF_SH5_ISA32 flag for ISA SHmedia code sections, and pass
    through SHT_SH5_CR_SORTED on a sorted .cranges section.  */
 
 /* Set the SHF_SH5_ISA32 flag for ISA SHmedia code sections, and pass
    through SHT_SH5_CR_SORTED on a sorted .cranges section.  */
 

-boolean
-sh64_elf_fake_sections (output_bfd, elf_section_hdr, asect)
-     bfd *output_bfd ATTRIBUTE_UNUSED;
-     Elf_Internal_Shdr *elf_section_hdr;
-     asection *asect;
+bfd_boolean
+sh64_elf_fake_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+                       Elf_Internal_Shdr *elf_section_hdr,
+                       asection *asect)

 {
 {

-  if (sh64_elf_section_data (asect) != NULL)
+  if (sh64_elf_section_data (asect)->sh64_info != NULL)

     elf_section_hdr->sh_flags
     elf_section_hdr->sh_flags

-      |= sh64_elf_section_data (asect)->contents_flags;
+      |= sh64_elf_section_data (asect)->sh64_info->contents_flags;

 
   /* If this section has the SEC_SORT_ENTRIES flag set, it is a sorted
      .cranges section passing through objcopy.  */
 
   /* If this section has the SEC_SORT_ENTRIES flag set, it is a sorted
      .cranges section passing through objcopy.  */


@@ -125,15 +149,13 @@ sh64_elf_fake_sections (output_bfd, elf_section_hdr, asect)
                 SH64_CRANGES_SECTION_NAME) == 0)
     elf_section_hdr->sh_type = SHT_SH5_CR_SORTED;
 
                 SH64_CRANGES_SECTION_NAME) == 0)
     elf_section_hdr->sh_type = SHT_SH5_CR_SORTED;
 

-  return true;
+  return TRUE;

 }
 
 }
 

-static boolean
-sh64_elf_set_mach_from_flags (abfd)
-     bfd *abfd;
+static bfd_boolean
+sh64_elf_set_mach_from_flags (bfd *abfd)

 {
   flagword flags = elf_elfheader (abfd)->e_flags;
 {
   flagword flags = elf_elfheader (abfd)->e_flags;

-  asection *cranges;

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


@@ -145,54 +167,53 @@ sh64_elf_set_mach_from_flags (abfd)
 
     default:
       bfd_set_error (bfd_error_wrong_format);
 
     default:
       bfd_set_error (bfd_error_wrong_format);

-      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 false;
-
-  return true;
+  return TRUE;
+}
+
+static bfd_boolean
+sh64_elf_section_flags (flagword *flags,
+                       const Elf_Internal_Shdr *hdr)
+{
+  if (hdr->bfd_section == NULL)
+    return FALSE;
+
+  if (strcmp (hdr->bfd_section->name, SH64_CRANGES_SECTION_NAME) == 0)
+    *flags |= SEC_DEBUGGING;
+
+  return TRUE;

 }
 
 }
 

-static boolean
-sh64_elf_copy_private_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
+static bfd_boolean
+sh64_elf_copy_private_data (bfd * ibfd, bfd * obfd)

 {
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
 {
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)

-    return true;
+    return TRUE;

 
   BFD_ASSERT (!elf_flags_init (obfd)
              || (elf_elfheader (obfd)->e_flags
                  == elf_elfheader (ibfd)->e_flags));
 
   elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
 
   BFD_ASSERT (!elf_flags_init (obfd)
              || (elf_elfheader (obfd)->e_flags
                  == elf_elfheader (ibfd)->e_flags));
 
   elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;

-  return true;
+
+  return _bfd_elf_copy_private_bfd_data (ibfd, obfd);

 }
 
 }
 

-static boolean
-sh64_elf_merge_private_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
+static bfd_boolean
+sh64_elf_merge_private_data (bfd *ibfd, struct bfd_link_info *info)

 {
 {

+  bfd *obfd = info->output_bfd;

   flagword old_flags, new_flags;
 
   flagword old_flags, new_flags;
 

-  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+  if (! _bfd_generic_verify_endian_match (ibfd, info))
+    return FALSE;

 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)

-    return true;
+    return TRUE;

 
   if (bfd_get_arch_size (ibfd) != bfd_get_arch_size (obfd))
     {
 
   if (bfd_get_arch_size (ibfd) != bfd_get_arch_size (obfd))
     {


@@ -200,17 +221,19 @@ sh64_elf_merge_private_data (ibfd, obfd)
 
       if (bfd_get_arch_size (ibfd) == 32
          && bfd_get_arch_size (obfd) == 64)
 
       if (bfd_get_arch_size (ibfd) == 32
          && bfd_get_arch_size (obfd) == 64)

-       msg = _("%s: compiled as 32-bit object and %s is 64-bit");
+       /* xgettext:c-format */
+       msg = _("%B: compiled as 32-bit object and %B is 64-bit");

       else if (bfd_get_arch_size (ibfd) == 64
               && bfd_get_arch_size (obfd) == 32)
       else if (bfd_get_arch_size (ibfd) == 64
               && bfd_get_arch_size (obfd) == 32)

-       msg = _("%s: compiled as 64-bit object and %s is 32-bit");
+       /* xgettext:c-format */
+       msg = _("%B: compiled as 64-bit object and %B is 32-bit");

       else
       else

-       msg = _("%s: object size does not match that of target %s");
+       /* xgettext:c-format */
+       msg = _("%B: object size does not match that of target %B");

 
 

-      (*_bfd_error_handler) (msg, bfd_get_filename (ibfd),
-                            bfd_get_filename (obfd));
+      _bfd_error_handler (msg, ibfd, obfd);

       bfd_set_error (bfd_error_wrong_format);
       bfd_set_error (bfd_error_wrong_format);

-      return false;
+      return FALSE;

     }
 
   old_flags = elf_elfheader (obfd)->e_flags;
     }
 
   old_flags = elf_elfheader (obfd)->e_flags;


@@ -218,17 +241,18 @@ sh64_elf_merge_private_data (ibfd, obfd)
   if (! elf_flags_init (obfd))
     {
       /* This happens when ld starts out with a 'blank' output file.  */
   if (! elf_flags_init (obfd))
     {
       /* This happens when ld starts out with a 'blank' output file.  */

-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;

       elf_elfheader (obfd)->e_flags = old_flags = new_flags;
     }
   /* We don't allow linking in non-SH64 code.  */
   else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5)
     {
       elf_elfheader (obfd)->e_flags = old_flags = new_flags;
     }
   /* We don't allow linking in non-SH64 code.  */
   else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5)
     {

-      (*_bfd_error_handler)
-       ("%s: uses non-SH64 instructions while previous modules use SH64 instructions",
-        bfd_get_filename (ibfd));
+      _bfd_error_handler
+       ("%B: uses non-SH64 instructions while previous modules"
+        " use SH64 instructions",
+        ibfd);

       bfd_set_error (bfd_error_bad_value);
       bfd_set_error (bfd_error_bad_value);

-      return false;
+      return FALSE;

     }
 
   /* I can't think of anything sane other than old_flags being EF_SH5 and
     }
 
   /* I can't think of anything sane other than old_flags being EF_SH5 and


@@ -238,26 +262,25 @@ sh64_elf_merge_private_data (ibfd, 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.  */
 
 
    We only recognize SHT_SH5_CR_SORTED, on the .cranges section.  */
 

-boolean
-sh64_backend_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf_Internal_Shdr *hdr;
-     const char *name;
+bfd_boolean
+sh64_backend_section_from_shdr (bfd *abfd, Elf_Internal_Shdr *hdr,
+                               const char *name, int shindex)

 {
   flagword flags = 0;
 
   /* We do like MIPS with a bit switch for recognized types, and returning
 {
   flagword flags = 0;
 
   /* We do like MIPS with a bit switch for recognized types, and returning

-     false for a recognized section type with an unexpected name.  Right
+     FALSE for a recognized section type with an unexpected name.  Right

      now we only have one recognized type, but that might change.  */
   switch (hdr->sh_type)
     {
     case SHT_SH5_CR_SORTED:
       if (strcmp (name, SH64_CRANGES_SECTION_NAME) != 0)
      now we only have one recognized type, but that might change.  */
   switch (hdr->sh_type)
     {
     case SHT_SH5_CR_SORTED:
       if (strcmp (name, SH64_CRANGES_SECTION_NAME) != 0)

-       return false;
+       return FALSE;

 
       /* We set the SEC_SORT_ENTRIES flag so it can be passed on to
         sh64_elf_fake_sections, keeping SHT_SH5_CR_SORTED if this object
 
       /* We set the SEC_SORT_ENTRIES flag so it can be passed on to
         sh64_elf_fake_sections, keeping SHT_SH5_CR_SORTED if this object


@@ -268,20 +291,20 @@ sh64_backend_section_from_shdr (abfd, hdr, name)
       break;
 
     default:
       break;
 
     default:

-      return false;
+      return FALSE;

     }
 
     }
 

-  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;

 
   if (flags
       && ! bfd_set_section_flags (abfd, hdr->bfd_section,
                                  bfd_get_section_flags (abfd,
                                                         hdr->bfd_section)
                                  | flags))
 
   if (flags
       && ! bfd_set_section_flags (abfd, hdr->bfd_section,
                                  bfd_get_section_flags (abfd,
                                                         hdr->bfd_section)
                                  | flags))

-    return false;
+    return FALSE;

 
 

-  return true;
+  return TRUE;

 }
 
 /* In contrast to sh64_backend_section_from_shdr, this is called for all
 }
 
 /* In contrast to sh64_backend_section_from_shdr, this is called for all


@@ -289,61 +312,54 @@ sh64_backend_section_from_shdr (abfd, hdr, name)
    assembling.  We need to set up the sh64_elf_section_data (asection *)
    structure for the SH64 ELF section flags to be copied correctly.  */
 
    assembling.  We need to set up the sh64_elf_section_data (asection *)
    structure for the SH64 ELF section flags to be copied correctly.  */
 

-boolean
-sh64_bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
-     bfd *ibfd;
-     asection *isec;
-     bfd *obfd;
-     asection *osec;
+bfd_boolean
+sh64_bfd_elf_copy_private_section_data (bfd *ibfd, asection *isec,
+                                       bfd *obfd, asection *osec)

 {
   struct sh64_section_data *sh64_sec_data;
 
   if (ibfd->xvec->flavour != bfd_target_elf_flavour
       || obfd->xvec->flavour != bfd_target_elf_flavour)
 {
   struct sh64_section_data *sh64_sec_data;
 
   if (ibfd->xvec->flavour != bfd_target_elf_flavour
       || obfd->xvec->flavour != bfd_target_elf_flavour)

-    return true;
+    return TRUE;

 
   if (! _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec))
 
   if (! _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec))

-    return false;
+    return FALSE;

 
 

-  sh64_sec_data = sh64_elf_section_data (isec);
+  sh64_sec_data = sh64_elf_section_data (isec)->sh64_info;

   if (sh64_sec_data == NULL)
     {
       sh64_sec_data = bfd_zmalloc (sizeof (struct sh64_section_data));
 
       if (sh64_sec_data == NULL)
   if (sh64_sec_data == NULL)
     {
       sh64_sec_data = bfd_zmalloc (sizeof (struct sh64_section_data));
 
       if (sh64_sec_data == NULL)

-       return false;
+       return FALSE;

 
       sh64_sec_data->contents_flags
        = (elf_section_data (isec)->this_hdr.sh_flags
           & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED));
 
 
       sh64_sec_data->contents_flags
        = (elf_section_data (isec)->this_hdr.sh_flags
           & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED));
 

-      sh64_elf_section_data (osec) = sh64_sec_data;
+      sh64_elf_section_data (osec)->sh64_info = sh64_sec_data;

     }
 
     }
 

-  return true;
+  return TRUE;

 }
 
 /* Function to keep SH64 specific file flags.  */
 
 }
 
 /* Function to keep SH64 specific file flags.  */
 

-static boolean
-sh64_elf_set_private_flags (abfd, flags)
-     bfd *    abfd;
-     flagword flags;
+static bfd_boolean
+sh64_elf_set_private_flags (bfd *abfd, flagword flags)

 {
   BFD_ASSERT (! elf_flags_init (abfd)
              || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
 {
   BFD_ASSERT (! elf_flags_init (abfd)
              || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;

-  elf_flags_init (abfd) = true;
+  elf_flags_init (abfd) = TRUE;

   return sh64_elf_set_mach_from_flags (abfd);
 }
 
 /* Called when writing out an object file to decide the type of a symbol.  */
 
 static int
   return sh64_elf_set_mach_from_flags (abfd);
 }
 
 /* Called when writing out an object file to decide the type of a symbol.  */
 
 static int

-sh64_elf_get_symbol_type (elf_sym, type)
-     Elf_Internal_Sym * elf_sym;
-     int type;
+sh64_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)

 {
   if (ELF_ST_TYPE (elf_sym->st_info) == STT_DATALABEL)
     return STT_DATALABEL;
 {
   if (ELF_ST_TYPE (elf_sym->st_info) == STT_DATALABEL)
     return STT_DATALABEL;


@@ -369,27 +385,23 @@ sh64_elf_get_symbol_type (elf_sym, type)
    or the hash entry, alternatively adding the index to Elf_Internal_Sym
    (not so good).  */
 
    or the hash entry, alternatively adding the index to Elf_Internal_Sym
    (not so good).  */
 

-static boolean
-sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const Elf_Internal_Sym *sym;
-     const char **namep;
-     flagword *flagsp ATTRIBUTE_UNUSED;
-     asection **secp;
-     bfd_vma *valp;
+static bfd_boolean
+sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+                         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
 {
   /* 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;
 

-      /* For relocateable links, we register the DataLabel sym in its own
+      /* For relocatable links, we register the DataLabel sym in its own

         right, and tweak the name when it's output.  Otherwise, we make
         an indirect symbol of it.  */
       flagword flags
         right, and tweak the name when it's output.  Otherwise, we make
         an indirect symbol of it.  */
       flagword flags

-       = info->relocateable || info->emitrelocations
+       = bfd_link_relocatable (info) || info->emitrelocations

        ? BSF_GLOBAL : BSF_GLOBAL | BSF_INDIRECT;
 
       char *dl_name
        ? BSF_GLOBAL : BSF_GLOBAL | BSF_INDIRECT;
 
       char *dl_name


@@ -400,31 +412,31 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
       /* Allocation may fail.  */
       if (dl_name == NULL)
 
       /* Allocation may fail.  */
       if (dl_name == NULL)

-       return false;
+       return FALSE;

 
       strcpy (dl_name, *namep);
       strcat (dl_name, DATALABEL_SUFFIX);
 
       h = (struct elf_link_hash_entry *)
 
       strcpy (dl_name, *namep);
       strcat (dl_name, DATALABEL_SUFFIX);
 
       h = (struct elf_link_hash_entry *)

-       bfd_link_hash_lookup (info->hash, dl_name, false, false, false);
+       bfd_link_hash_lookup (info->hash, dl_name, FALSE, FALSE, FALSE);

 
       if (h == NULL)
        {
          /* No previous datalabel symbol.  Make one.  */
          struct bfd_link_hash_entry *bh = NULL;
 
       if (h == NULL)
        {
          /* No previous datalabel symbol.  Make one.  */
          struct bfd_link_hash_entry *bh = NULL;

-         struct elf_backend_data *bed = get_elf_backend_data (abfd);
+         const struct elf_backend_data *bed = get_elf_backend_data (abfd);

 
          if (! _bfd_generic_link_add_one_symbol (info, abfd, dl_name,
                                                  flags, *secp, *valp,
 
          if (! _bfd_generic_link_add_one_symbol (info, abfd, dl_name,
                                                  flags, *secp, *valp,

-                                                 *namep, false,
+                                                 *namep, FALSE,

                                                  bed->collect, &bh))
            {
              free (dl_name);
                                                  bed->collect, &bh))
            {
              free (dl_name);

-             return false;
+             return FALSE;

            }
 
          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


@@ -433,17 +445,16 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
        free (dl_name);
 
       if (h->type != STT_DATALABEL
        free (dl_name);
 
       if (h->type != STT_DATALABEL

-         || ((info->relocateable || info->emitrelocations)
+         || ((bfd_link_relocatable (info) || info->emitrelocations)

              && h->root.type != bfd_link_hash_undefined)
              && h->root.type != bfd_link_hash_undefined)

-         || (! info->relocateable && !info->emitrelocations
+         || (! bfd_link_relocatable (info) && !info->emitrelocations

              && h->root.type != bfd_link_hash_indirect))
        {
          /* Make sure we don't get confused on invalid input.  */
              && h->root.type != bfd_link_hash_indirect))
        {
          /* Make sure we don't get confused on invalid input.  */

-         (*_bfd_error_handler)
-           (_("%s: encountered datalabel symbol in input"),
-            bfd_get_filename (abfd));
+         _bfd_error_handler
+           (_("%B: encountered datalabel symbol in input"), abfd);

          bfd_set_error (bfd_error_bad_value);
          bfd_set_error (bfd_error_bad_value);

-         return false;
+         return FALSE;

        }
 
       /* Now find the hash-table slot for this entry and fill it in.  */
        }
 
       /* Now find the hash-table slot for this entry and fill it in.  */


@@ -455,7 +466,7 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       *namep = NULL;
     }
 
       *namep = NULL;
     }
 

-  return true;
+  return TRUE;

 }
 
 /* This hook function is called before the linker writes out a global
 }
 
 /* This hook function is called before the linker writes out a global


@@ -470,38 +481,32 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
    we don't need to look up and make sure to emit the main symbol for each
    DataLabel symbol.  */
 
    we don't need to look up and make sure to emit the main symbol for each
    DataLabel symbol.  */
 

-boolean
-sh64_elf_link_output_symbol_hook (abfd, info, cname, sym, input_sec)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info;
-     const char *cname;
-     Elf_Internal_Sym *sym;
-     asection *input_sec ATTRIBUTE_UNUSED;
+static int
+sh64_elf_link_output_symbol_hook (struct bfd_link_info *info,
+                                 const char *cname,
+                                 Elf_Internal_Sym *sym,
+                                 asection *input_sec ATTRIBUTE_UNUSED,
+                                 struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)

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

-  if (info->relocateable || info->emitrelocations)
+  if (bfd_link_relocatable (info) || info->emitrelocations)

     {
       if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL)
        name[strlen (name) - strlen (DATALABEL_SUFFIX)] = 0;
     }
 
     {
       if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL)
        name[strlen (name) - strlen (DATALABEL_SUFFIX)] = 0;
     }
 

-  return true;
+  return 1;

 }
 
 /* Check a SH64-specific reloc and put the value to relocate to into
    RELOCATION, ready to pass to _bfd_final_link_relocate.  Return FALSE if
    bad value, TRUE if ok.  */
 
 }
 
 /* Check a SH64-specific reloc and put the value to relocate to into
    RELOCATION, ready to pass to _bfd_final_link_relocate.  Return FALSE if
    bad value, TRUE if ok.  */
 

-static boolean
-shmedia_prepare_reloc (info, abfd, input_section,
-                      contents, rel, relocation)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     asection *input_section;
-     bfd_byte *contents;
-     const Elf_Internal_Rela *rel;
-     bfd_vma *relocation;
+static bfd_boolean
+shmedia_prepare_reloc (struct bfd_link_info *info, bfd *abfd,
+                      asection *input_section, bfd_byte *contents,
+                      const Elf_Internal_Rela *rel, bfd_vma *relocation)

 {
   bfd_vma disp, dropped;
 
 {
   bfd_vma disp, dropped;
 


@@ -528,11 +533,9 @@ shmedia_prepare_reloc (info, abfd, input_section,
                     && ((*relocation + rel->r_addend) & 1) == 0)
              msg = _("PTA mismatch: a SHcompact address (bit 0 == 0)");
 
                     && ((*relocation + rel->r_addend) & 1) == 0)
              msg = _("PTA mismatch: a SHcompact address (bit 0 == 0)");
 

-           if (msg != NULL
-               && ! ((*info->callbacks->reloc_dangerous)
-                     (info, msg, abfd, input_section,
-                      rel->r_offset)))
-             return false;
+           if (msg != NULL)
+             (*info->callbacks->reloc_dangerous)
+               (info, msg, abfd, input_section, rel->r_offset);

          }
        else
          {
          }
        else
          {


@@ -543,10 +546,10 @@ shmedia_prepare_reloc (info, abfd, input_section,
               unknown destination (or when relaxing) will get us here.  */
            if ((insn & SHMEDIA_PTB_BIT) != 0)
              {
               unknown destination (or when relaxing) will get us here.  */
            if ((insn & SHMEDIA_PTB_BIT) != 0)
              {

-               (*_bfd_error_handler)
-                 (_("%s: GAS error: unexpected PTB insn with R_SH_PT_16"),
-                  bfd_get_filename (input_section->owner));
-               return false;
+               _bfd_error_handler
+                 (_("%B: GAS error: unexpected PTB insn with R_SH_PT_16"),
+                  input_section->owner);
+               return FALSE;

              }
 
            /* Change the PTA to a PTB, if destination indicates so.  */
              }
 
            /* Change the PTA to a PTB, if destination indicates so.  */


@@ -579,7 +582,7 @@ shmedia_prepare_reloc (info, abfd, input_section,
       break;
 
     default:
       break;
 
     default:

-      return false;
+      return FALSE;

     }
 
   disp = (*relocation & 0xf);
     }
 
   disp = (*relocation & 0xf);


@@ -592,27 +595,27 @@ shmedia_prepare_reloc (info, abfd, input_section,
     }
   if (dropped != 0)
     {
     }
   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);
-      return false;
+      _bfd_error_handler
+       /* xgettext:c-format */
+       (_("%B: error: unaligned relocation type %d at %#Lx reloc %#Lx"),
+        input_section->owner, (int) ELF32_R_TYPE (rel->r_info),
+        rel->r_offset, *relocation);
+      return FALSE;

     }
 
     }
 

-  return true;
+  return TRUE;

 }
 
 /* Helper function to locate the section holding a certain address.  This
    is called via bfd_map_over_sections.  */
 
 static void
 }
 
 /* Helper function to locate the section holding a certain address.  This
    is called via bfd_map_over_sections.  */
 
 static void

-sh64_find_section_for_address (abfd, section, data)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asection *section;
-     PTR data;
+sh64_find_section_for_address (bfd *abfd ATTRIBUTE_UNUSED,
+                              asection *section, void *data)

 {
   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;
 


@@ -628,11 +631,7 @@ sh64_find_section_for_address (abfd, section, data)
   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;
 


@@ -645,9 +644,8 @@ sh64_find_section_for_address (abfd, section, data)
    executables (final linking and objcopy).  */
 
 static void
    executables (final linking and objcopy).  */
 
 static void

-sh64_elf_final_write_processing (abfd, linker)
-     bfd *   abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+sh64_elf_final_write_processing (bfd *abfd,
+                                bfd_boolean linker ATTRIBUTE_UNUSED)

 {
   bfd_vma ld_generated_cranges_size;
   asection *cranges
 {
   bfd_vma ld_generated_cranges_size;
   asection *cranges


@@ -661,12 +659,10 @@ sh64_elf_final_write_processing (abfd, linker)
       && cranges != NULL
       && elf_elfheader (abfd)->e_type != ET_EXEC
       && (ld_generated_cranges_size
       && cranges != NULL
       && elf_elfheader (abfd)->e_type != ET_EXEC
       && (ld_generated_cranges_size

-         = sh64_elf_section_data (cranges)->cranges_growth) != 0)
+         = sh64_elf_section_data (cranges)->sh64_info->cranges_growth) != 0)

     {
       bfd_vma incoming_cranges_size
     {
       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


@@ -676,9 +672,8 @@ sh64_elf_final_write_processing (abfd, linker)
                                      ld_generated_cranges_size))
        {
          bfd_set_error (bfd_error_file_truncated);
                                      ld_generated_cranges_size))
        {
          bfd_set_error (bfd_error_file_truncated);

-         (*_bfd_error_handler)
-           (_("%s: could not write out added .cranges entries"),
-            bfd_get_filename (abfd));
+         _bfd_error_handler
+           (_("%B: could not write out added .cranges entries"), abfd);

        }
     }
 
        }
     }
 


@@ -699,7 +694,7 @@ sh64_elf_final_write_processing (abfd, linker)
       fsec_data.section = NULL;
 
       bfd_map_over_sections (abfd, sh64_find_section_for_address,
       fsec_data.section = NULL;
 
       bfd_map_over_sections (abfd, sh64_find_section_for_address,

-                            (PTR) &fsec_data);
+                            &fsec_data);

       if (fsec_data.section
          && (sh64_get_contents_type (fsec_data.section,
                                      elf_elfheader (abfd)->e_entry,
       if (fsec_data.section
          && (sh64_get_contents_type (fsec_data.section,
                                      elf_elfheader (abfd)->e_entry,


@@ -709,9 +704,7 @@ sh64_elf_final_write_processing (abfd, linker)
       /* 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);


@@ -738,10 +731,83 @@ sh64_elf_final_write_processing (abfd, linker)
                                          cranges_size))
            {
              bfd_set_error (bfd_error_file_truncated);
                                          cranges_size))
            {
              bfd_set_error (bfd_error_file_truncated);

-             (*_bfd_error_handler)
-               (_("%s: could not write out sorted .cranges entries"),
-                bfd_get_filename (abfd));
+             _bfd_error_handler
+               (_("%B: could not write out sorted .cranges entries"), abfd);

            }
        }
     }
 }
            }
        }
     }
 }

+
+/* 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[] =
+{
+  { STRING_COMMA_LEN (".cranges"), 0, SHT_PROGBITS, 0 },
+  { NULL,                       0, 0, 0,            0 }
+};
+
+#undef TARGET_BIG_SYM
+#define        TARGET_BIG_SYM          sh64_elf32_vec
+#undef TARGET_BIG_NAME
+#define        TARGET_BIG_NAME         "elf32-sh64"
+#undef TARGET_LITTLE_SYM
+#define        TARGET_LITTLE_SYM       sh64_elf32_le_vec
+#undef TARGET_LITTLE_NAME
+#define        TARGET_LITTLE_NAME      "elf32-sh64l"
+
+#include "elf32-target.h"
+
+/* NetBSD support.  */
+#undef TARGET_BIG_SYM
+#define        TARGET_BIG_SYM          sh64_elf32_nbsd_vec
+#undef TARGET_BIG_NAME
+#define        TARGET_BIG_NAME         "elf32-sh64-nbsd"
+#undef TARGET_LITTLE_SYM
+#define        TARGET_LITTLE_SYM       sh64_elf32_nbsd_le_vec
+#undef TARGET_LITTLE_NAME
+#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
+#define        elf32_bed               elf32_sh64_nbsd_bed
+
+#include "elf32-target.h"
+
+/* Linux support.  */
+#undef TARGET_BIG_SYM
+#define        TARGET_BIG_SYM          sh64_elf32_linux_be_vec
+#undef TARGET_BIG_NAME
+#define        TARGET_BIG_NAME         "elf32-sh64big-linux"
+#undef TARGET_LITTLE_SYM
+#define        TARGET_LITTLE_SYM       sh64_elf32_linux_vec
+#undef TARGET_LITTLE_NAME
+#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"
+