[AArch64] BFD support BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14

This patch add BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14 relocation
supoprt in bfd linker.

2015-06-01  Jiong Wang  <jiong.wang@arm.com>

bfd/
  * elfnn-aarch64.c (aarch64_reloc_got_type): Support
  BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14.
  (elfNN_aarch64_final_link_relocate): Ditto.
  (elfNN_aarch64_gc_swap_hook): Ditto.
  (elfNN_aarch64_check_relocs): Ditto.
  * elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Ditto.

ld/testsuite/
  * ld-aarch64/emit-relocs-28.s: New test file.
  * ld-aarch64/emit-relocs-28.d: Ditto.
  * ld-aarch64/aarch64-elf.exp: Run new test.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e1ce381..4001dce 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,14 @@
 2015-06-01  Jiong Wang  <jiong.wang@arm.com>
 
+       * elfnn-aarch64.c (aarch64_reloc_got_type): Support
+       BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14.
+       (elfNN_aarch64_final_link_relocate): Ditto.
+       (elfNN_aarch64_gc_swap_hook): Ditto.
+       (elfNN_aarch64_check_relocs): Ditto.
+       * elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Ditto.
+
+2015-06-01  Jiong Wang  <jiong.wang@arm.com>
+
        * reloc.c (BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14): New entry.
        * bfd-in2.h: Regenerate.
        * libbfd.h: Regenerate.

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 3104de7..4065dfc 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -4067,6 +4067,7 @@ aarch64_reloc_got_type (bfd_reloc_code_real_type r_type)
     {
     case BFD_RELOC_AARCH64_ADR_GOT_PAGE:
     case BFD_RELOC_AARCH64_GOT_LD_PREL19:
+    case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
     case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
     case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
     case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
@@ -4621,6 +4622,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
                                              howto, value);
        case BFD_RELOC_AARCH64_ADR_GOT_PAGE:
        case BFD_RELOC_AARCH64_GOT_LD_PREL19:
+       case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
        case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
        case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
        case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
@@ -4682,7 +4684,8 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
            value = aarch64_calculate_got_entry_vma (h, globals, info,
                                                     value, output_bfd,
                                                     unresolved_reloc_p);
-         if (bfd_r_type == BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15)
+         if (bfd_r_type == BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15
+             || bfd_r_type == BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14)
            addend = (globals->root.sgot->output_section->vma
                      + globals->root.sgot->output_offset);
          value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value,
@@ -4890,6 +4893,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
 
     case BFD_RELOC_AARCH64_ADR_GOT_PAGE:
     case BFD_RELOC_AARCH64_GOT_LD_PREL19:
+    case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
     case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
     case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
     case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
@@ -4902,7 +4906,8 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
          value = aarch64_calculate_got_entry_vma (h, globals, info, value,
                                                   output_bfd,
                                                   unresolved_reloc_p);
-         if (bfd_r_type == BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15)
+         if (bfd_r_type == BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15
+             || bfd_r_type == BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14)
            addend = (globals->root.sgot->output_section->vma
                      + globals->root.sgot->output_offset);
          value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value,
@@ -4960,7 +4965,8 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
           the direct data access into indirect data access through GOT.  */
        value = got_entry_addr;
 
-       if (bfd_r_type == BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15)
+       if (bfd_r_type == BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15
+           || bfd_r_type == BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14)
          addend = base_got->output_section->vma + base_got->output_offset;
 
        value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value,
@@ -5959,6 +5965,7 @@ elfNN_aarch64_gc_sweep_hook (bfd *abfd,
        {
        case BFD_RELOC_AARCH64_ADR_GOT_PAGE:
        case BFD_RELOC_AARCH64_GOT_LD_PREL19:
+       case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
        case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
        case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
        case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
@@ -6317,6 +6324,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
            case BFD_RELOC_AARCH64_CALL26:
            case BFD_RELOC_AARCH64_GOT_LD_PREL19:
            case BFD_RELOC_AARCH64_JUMP26:
+           case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
            case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
            case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
            case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
@@ -6429,6 +6437,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
             there are no dangling GOT_PAGE relocs.  */
        case BFD_RELOC_AARCH64_ADR_GOT_PAGE:
        case BFD_RELOC_AARCH64_GOT_LD_PREL19:
+       case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
        case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
        case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
        case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:

diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index ec0744b..7b1a394 100644 (file)
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -257,6 +257,7 @@ _bfd_aarch64_elf_put_addend (bfd *abfd,
       contents = reencode_add_imm (contents, addend);
       break;
 
+    case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
     case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
     case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
     case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
@@ -414,6 +415,7 @@ _bfd_aarch64_elf_resolve_relocation (bfd_reloc_code_real_type r_type,
       value = PG (value + addend) - PG (place);
       break;
 
+    case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
     case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
       /* Caller must make sure addend is the base address of .got section.  */
       value = value - PG (addend);

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b03786c..a68a217 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2015-06-01  Jiong Wang  <jiong.wang@arm.com>
 
+       * ld-aarch64/emit-relocs-28.s: New test file.
+       * ld-aarch64/emit-relocs-28.d: Ditto.
+       * ld-aarch64/aarch64-elf.exp: Run new test.
+
+2015-06-01  Jiong Wang  <jiong.wang@arm.com>
+
        * ld-aarch64/tprel_add_lo12_overflow.s: New testcase.
        * ld-aarch64/tprel_add_lo12_overflow.d: Nex expectation file.
        * ld-aarch64/aarch64-elf.exp: Run new testcase.

diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 09f2a0e..021343b 100644 (file)
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -50,6 +50,7 @@ run_dump_test "erratum843419"
 
 # Relocation Tests
 run_dump_test "weak-undefined"
+run_dump_test "emit-relocs-28"
 run_dump_test "emit-relocs-257"
 run_dump_test "emit-relocs-257-be"
 # 258 is tested in 257

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-28.d b/ld/testsuite/ld-aarch64/emit-relocs-28.d
new file mode 100644 (file)
index 0000000..f138fb1
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-28.d
@@ -0,0 +1,19 @@
+#source: emit-relocs-28.s
+#as: -mabi=ilp32
+#ld: -m aarch64linux32 --defsym globala=0x11000 --defsym globalb=0x45000 --defsym globalc=0x1234  -e0 --emit-relocs
+#objdump: -dr
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+00400074 <\.text>:
+  400074:      90000082        adrp    x2, 410000 <globalb\+0x3cb000>
+                       400074: R_AARCH64_P32_ADR_PREL_PG_HI21  _GLOBAL_OFFSET_TABLE_
+  400078:      f9408c40        ldr     x0, \[x2,#280\]
+                       400078: R_AARCH64_P32_LD32_GOTPAGE_LO14 globala
+  40007c:      f9409040        ldr     x0, \[x2,#288\]
+                       40007c: R_AARCH64_P32_LD32_GOTPAGE_LO14 globalb
+  400080:      f9408840        ldr     x0, \[x2,#272\]
+                       400080: R_AARCH64_P32_LD32_GOTPAGE_LO14 globalc

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-28.s b/ld/testsuite/ld-aarch64/emit-relocs-28.s
new file mode 100644 (file)
index 0000000..b13a0e5
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-28.s
@@ -0,0 +1,5 @@
+       .text
+       adrp  x2, _GLOBAL_OFFSET_TABLE_
+       ldr     x0, [x2, #:gotpage_lo14:globala]
+       ldr     x0, [x2, #:gotpage_lo14:globalb]
+       ldr     x0, [x2, #:gotpage_lo14:globalc]