Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / elf-hppa.h

diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index b907f6e676c91b67eb5413c672083ab591265f2d..b87ee836ea19336d6687b92bc5ddf739b4f6e0a3 100644 (file)
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -1,5 +1,5 @@
 /* Common code for PA ELF implementations.
 /* Common code for PA ELF implementations.

-   Copyright (C) 1999-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2018 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -27,20 +27,20 @@
    external constraints require 32 or 64 bit specific code.  We remap
    the definitions/functions as necessary here.  */
 #if ARCH_SIZE == 64
    external constraints require 32 or 64 bit specific code.  We remap
    the definitions/functions as necessary here.  */
 #if ARCH_SIZE == 64

-#define ELF_R_TYPE(X)                 ELF64_R_TYPE(X)
-#define ELF_R_SYM(X)                  ELF64_R_SYM(X)
+#define ELF_R_TYPE(X)                ELF64_R_TYPE(X)
+#define ELF_R_SYM(X)                 ELF64_R_SYM(X)

 #define elf_hppa_reloc_final_type     elf64_hppa_reloc_final_type
 #define _bfd_elf_hppa_gen_reloc_type  _bfd_elf64_hppa_gen_reloc_type
 #define elf_hppa_relocate_section     elf64_hppa_relocate_section
 #define elf_hppa_reloc_final_type     elf64_hppa_reloc_final_type
 #define _bfd_elf_hppa_gen_reloc_type  _bfd_elf64_hppa_gen_reloc_type
 #define elf_hppa_relocate_section     elf64_hppa_relocate_section

-#define elf_hppa_final_link           elf64_hppa_final_link
+#define elf_hppa_final_link          elf64_hppa_final_link

 #endif
 #if ARCH_SIZE == 32
 #endif
 #if ARCH_SIZE == 32

-#define ELF_R_TYPE(X)                 ELF32_R_TYPE(X)
-#define ELF_R_SYM(X)                  ELF32_R_SYM(X)
+#define ELF_R_TYPE(X)                ELF32_R_TYPE(X)
+#define ELF_R_SYM(X)                 ELF32_R_SYM(X)

 #define elf_hppa_reloc_final_type     elf32_hppa_reloc_final_type
 #define _bfd_elf_hppa_gen_reloc_type  _bfd_elf32_hppa_gen_reloc_type
 #define elf_hppa_relocate_section     elf32_hppa_relocate_section
 #define elf_hppa_reloc_final_type     elf32_hppa_reloc_final_type
 #define _bfd_elf_hppa_gen_reloc_type  _bfd_elf32_hppa_gen_reloc_type
 #define elf_hppa_relocate_section     elf32_hppa_relocate_section

-#define elf_hppa_final_link           elf32_hppa_final_link
+#define elf_hppa_final_link          elf32_hppa_final_link

 #endif
 
 /* ELF/PA relocation howto entries.  */
 #endif
 
 /* ELF/PA relocation howto entries.  */


@@ -1117,6 +1117,7 @@ elf_hppa_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec)
          if (asec->name && strcmp (asec->name, ".text") == 0)
            {
              hdr->sh_info = indx;
          if (asec->name && strcmp (asec->name, ".text") == 0)
            {
              hdr->sh_info = indx;

+             hdr->sh_flags |= SHF_INFO_LINK;

              break;
            }
        }
              break;
            }
        }


@@ -1212,6 +1213,11 @@ elf_hppa_sort_unwind (bfd *abfd)
 static unsigned int
 elf_hppa_action_discarded (asection *sec)
 {
 static unsigned int
 elf_hppa_action_discarded (asection *sec)
 {

+  /* Ignore relocations in .data.rel.ro.local.  This section can contain
+     PLABEL32 relocations to functions in discarded COMDAT groups.  */
+  if (strcmp (".data.rel.ro.local", sec->name) == 0)
+    return 0;
+

   if (strcmp (".PARISC.unwind", sec->name) == 0)
     return 0;
 
   if (strcmp (".PARISC.unwind", sec->name) == 0)
     return 0;