[ARC] Fixed issue with DTSOFF relocs.

Inserted offset in final section in the GOT entry of type DTSOFF soon to be
relocated by the dynamic loader.

bfd/
2018-09-06  Cupertino Miranda <cmiranda@synopsys.com>

	* arc-got.h (relocate_fix_got_relocs_for_got_info): Changed. Take TLS
	    section alignment in consideration for this relocation.
	* elf32-arc.c (FINAL_SECTSTART): Added this formula macro.
	  (ARC_TLS_DTPOFF) Updated reloc to use new created macro instead.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b26e53135cb8955884ecd191c12b990b986593bf..896adc86c667f7ed89b9ae024724acb22f0ba611 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2018-11-15  Claudiu Zissulescu  <claziss@synopsys.com>
+
+       Backport from mainline
+       2018-09-06  Cupertino Miranda <cmiranda@synopsys.com>
+       * arc-got.h (relocate_fix_got_relocs_for_got_info): Changed. Take
+       TLS section alignment in consideration for this relocation.
+       * elf32-arc.c (FINAL_SECTSTART): Added this formula macro.
+       (ARC_TLS_DTPOFF) Updated reloc to use new created macro instead.
+
 2018-11-15  Claudiu Zissulescu  <claziss@synopsys.com>
 
        Backport from mainline
@@ -6,21 +15,18 @@
        TCB_SIZE offsize to include section alignment.
        * elf32-arc.c (arc_special_overflow_checks): Likewise.
 
-
 2018-11-15  Claudiu Zissulescu  <claziss@synopsys.com>
 
        Backport from mainline
        2018-03-02  Cupertino Miranda <cmiranda@synopsys.com>
        * elf32-arc.c (elf_arc_check_relocs): Changed.
 
-
 2018-11-15  Claudiu Zissulescu  <claziss@synopsys.com>
 
        Backport from mainline
        2018-03-02  Cupertino Miranda <cmiranda@synopsys.com>
        * elf32-arc.c (elf_arc_check_relocs): Changed.
 
-
 2018-11-15  Claudiu Zissulescu  <claziss@synopsys.com>
 
        Backport from mainline

diff --git a/bfd/arc-got.h b/bfd/arc-got.h
index e32d9b30e313510a6b65771dcb89666403efe439..07722fdffd41fb8c0c1d4ae27562c9bb97c47167 100644 (file)
--- a/bfd/arc-got.h
+++ b/bfd/arc-got.h
@@ -335,7 +335,11 @@ relocate_fix_got_relocs_for_got_info (struct got_entry **     list_p,
                bfd_vma sec_vma = tls_sec->output_section->vma;
 
                bfd_put_32 (output_bfd,
-                           sym_value - sec_vma,
+                           sym_value - sec_vma
+                           + (elf_hash_table (info)->dynamic_sections_created
+                              ? 0
+                              : (align_power (TCB_SIZE,
+                                              tls_sec->alignment_power))),
                            htab->sgot->contents + entry->offset
                            + (entry->existing_entries == TLS_GOT_MOD_AND_OFF
                               ? 4 : 0));
@@ -346,7 +350,7 @@ relocate_fix_got_relocs_for_got_info (struct got_entry **      list_p,
                            "GOT_TLS_IE"),
                           (long) (sym_value - sec_vma),
                           (long) (htab->sgot->output_section->vma
-                             + htab->sgot->output_offset->vma
+                             + htab->sgot->output_offset
                              + entry->offset
                              + (entry->existing_entries == TLS_GOT_MOD_AND_OFF
                                 ? 4 : 0)),
@@ -376,7 +380,7 @@ relocate_fix_got_relocs_for_got_info (struct got_entry **      list_p,
                            "GOT_TLS_IE"),
                           (long) (sym_value - sec_vma),
                           (long) (htab->sgot->output_section->vma
-                             + htab->sgot->output_offset->vma
+                             + htab->sgot->output_offset
                              + entry->offset
                              + (entry->existing_entries == TLS_GOT_MOD_AND_OFF
                                 ? 4 : 0)),

diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index d11b773adc54e0fd39e526239de33d7461d438ca..5ef62aa218925ecbf1b8cabcab8f5be4979cba6a 100644 (file)
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -1198,6 +1198,8 @@ arc_special_overflow_checks (const struct arc_relocation_data reloc_data,
             + (reloc_data.reloc_offset))))
 #define SECTSTART (bfd_signed_vma) (reloc_data.sym_section->output_section->vma \
                                    + reloc_data.sym_section->output_offset)
+#define FINAL_SECTSTART \
+  (bfd_signed_vma) (reloc_data.sym_section->output_section->vma)
 #define JLI (bfd_signed_vma) (reloc_data.sym_section->output_section->vma)
 #define _SDA_BASE_ (bfd_signed_vma) (reloc_data.sdata_begin_symbol_vma)
 #define TLS_REL (bfd_signed_vma) \

diff --git a/include/elf/arc-reloc.def b/include/elf/arc-reloc.def
index e1c69c9d70c69b4b04fd402a4cc6315c5698b414..61edd6e67a40a829c4ff8328287dd73fd7c8dcf0 100644 (file)
--- a/include/elf/arc-reloc.def
+++ b/include/elf/arc-reloc.def
@@ -468,7 +468,7 @@ ARC_RELOC_HOWTO(ARC_TLS_DTPOFF, 67, \
                 32, \
                 replace_word32, \
                 dont, \
-                ( ME ( S - SECTSTART ) + A ))
+               ( ME ( S - FINAL_SECTSTART ) + A ))
 
 ARC_RELOC_HOWTO(ARC_TLS_DTPOFF_S9, 73, \
                 2, \