Fix field size for TLSDESC_CALL

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

diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index 10a9396e95b3d94142362761fa61417b25a6a17f..7be08a970b0db9ab7dbbc93a7d584ab069887e84 100644 (file)
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1,6 +1,5 @@
 /* SuperH SH64-specific support for 64-bit ELF
-   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -106,7 +105,7 @@ static reloc_howto_type sh_elf64_howto_table[] = {
   /* No relocation.  */
   HOWTO (R_SH_NONE,            /* type */
         0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
+        3,                     /* size (0 = byte, 1 = short, 2 = long) */
         0,                     /* bitsize */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
@@ -2260,31 +2259,10 @@ sh_elf64_set_private_flags (bfd *abfd, flagword flags)
 static bfd_boolean
 sh_elf64_copy_private_data_internal (bfd *ibfd, bfd *obfd)
 {
-  Elf_Internal_Shdr **o_shdrp;
-  asection *isec;
-  asection *osec;
-
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
     return TRUE;
 
-  o_shdrp = elf_elfsections (obfd);
-  for (osec = obfd->sections; osec; osec = osec->next)
-    {
-      int oIndex = ((struct bfd_elf_section_data *) elf_section_data (osec))->this_idx;
-      for (isec = ibfd->sections; isec; isec = isec->next)
-       {
-         if (strcmp (osec->name, isec->name) == 0)
-           {
-             /* Note that we're not disallowing mixing data and code.  */
-             if ((elf_section_data (isec)->this_hdr.sh_flags
-                  & SHF_SH5_ISA32) != 0)
-               o_shdrp[oIndex]->sh_flags |= SHF_SH5_ISA32;
-             break;
-           }
-       }
-    }
-
   /* Copy object attributes.  */
   _bfd_elf_copy_private_bfd_data (ibfd, obfd);
   
@@ -3382,7 +3360,7 @@ sh64_elf64_adjust_dynamic_symbol (struct bfd_link_info *info,
       h->needs_copy = 1;
     }
 
-  return _bfd_elf_adjust_dynamic_copy (h, s);
+  return _bfd_elf_adjust_dynamic_copy (info, h, s);
 }
 
 /* This function is called via sh_elf_link_hash_traverse if we are
@@ -3958,9 +3936,9 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
   { NULL,                       0, 0, 0,            0 }
 };
 
-#define TARGET_BIG_SYM         bfd_elf64_sh64_vec
+#define TARGET_BIG_SYM         sh64_elf64_vec
 #define TARGET_BIG_NAME                "elf64-sh64"
-#define TARGET_LITTLE_SYM      bfd_elf64_sh64l_vec
+#define TARGET_LITTLE_SYM      sh64_elf64_le_vec
 #define TARGET_LITTLE_NAME     "elf64-sh64l"
 #define ELF_ARCH               bfd_arch_sh
 #define ELF_MACHINE_CODE       EM_SH
@@ -4030,11 +4008,11 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
 
 /* NetBSD support.  */
 #undef TARGET_BIG_SYM
-#define        TARGET_BIG_SYM                  bfd_elf64_sh64nbsd_vec
+#define        TARGET_BIG_SYM                  sh64_elf64_nbsd_vec
 #undef TARGET_BIG_NAME
 #define        TARGET_BIG_NAME                 "elf64-sh64-nbsd"
 #undef TARGET_LITTLE_SYM
-#define        TARGET_LITTLE_SYM               bfd_elf64_sh64lnbsd_vec
+#define        TARGET_LITTLE_SYM               sh64_elf64_nbsd_le_vec
 #undef TARGET_LITTLE_NAME
 #define        TARGET_LITTLE_NAME              "elf64-sh64l-nbsd"
 #undef ELF_MAXPAGESIZE
@@ -4048,11 +4026,11 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
 
 /* Linux support.  */
 #undef TARGET_BIG_SYM
-#define        TARGET_BIG_SYM                  bfd_elf64_sh64blin_vec
+#define        TARGET_BIG_SYM                  sh64_elf64_linux_be_vec
 #undef TARGET_BIG_NAME
 #define        TARGET_BIG_NAME                 "elf64-sh64big-linux"
 #undef TARGET_LITTLE_SYM
-#define        TARGET_LITTLE_SYM               bfd_elf64_sh64lin_vec
+#define        TARGET_LITTLE_SYM               sh64_elf64_linux_vec
 #undef TARGET_LITTLE_NAME
 #define        TARGET_LITTLE_NAME              "elf64-sh64-linux"
 #undef elf64_bed