projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 654248e)
[LD][AARCH64]Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G1 Support.
authorRenlin Li <renlin.li@arm.com>
Fri, 2 Oct 2015 14:29:41 +0000 (15:29 +0100)
committerRenlin Li <renlin.li@arm.com>
Fri, 2 Oct 2015 16:56:07 +0000 (17:56 +0100)
bfd/

2015-10-02  Renlin Li  <renlin.li@arm.com>

* elfnn-aarch64.c (aarch64_reloc_got_type): Add support
for BFD_RELOC_AARCH64_MOVW_GOTOFF_G1.
(elfNN_aarch64_gc_sweep_hook): Likewise.
(elfNN_aarch64_check_relocs): Likewise
* elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Likewise.
(_bfd_aarch64_elf_resolve_relocation): Likewise
(elfNN_aarch64_final_link_relocate): Calculate offset within GOT.

ld/testsuite/

2015-10-02  Renlin Li  <renlin.li@arm.com>

* ld-aarch64/emit-relocs-302.d: New.
* ld-aarch64/emit-relocs-302.s: New.
* ld-aarch64/aarch64-elf.exp: Run the new test.

bfd/ChangeLog patch | blob | history
bfd/elfnn-aarch64.c patch | blob | history
bfd/elfxx-aarch64.c patch | blob | history
ld/testsuite/ChangeLog patch | blob | history
ld/testsuite/ld-aarch64/aarch64-elf.exp patch | blob | history
ld/testsuite/ld-aarch64/emit-relocs-302.d [new file with mode: 0644] patch | blob
ld/testsuite/ld-aarch64/emit-relocs-302.s [new file with mode: 0644] patch | blob

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c3b0cc9414a03402a45d53e081bcb1aac197d771..f92ef661a7da32f387de1152cb6f6c8262c4cbff 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2015-10-02  Renlin Li  <renlin.li@arm.com>
+
+       * elfnn-aarch64.c (aarch64_reloc_got_type): Add support
+       for BFD_RELOC_AARCH64_MOVW_GOTOFF_G1.
+       (elfNN_aarch64_gc_sweep_hook): Likewise.
+       (elfNN_aarch64_check_relocs): Likewise
+       * elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Likewise.
+       (_bfd_aarch64_elf_resolve_relocation): Likewise
+       (elfNN_aarch64_final_link_relocate): Likewise
+
 2015-010-02  Renlin Li  <renlin.li@arm.com>
 
        * reloc.c (BFD_RELOC_AARCH64_MOVW_GOTOFF_G1): New.
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 7349ad7b0f020e0b80dfc399cab3106bfee85033..715eff62182557f392ee3a3c3c439f90145ba3ee 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -4432,6 +4432,7 @@ aarch64_reloc_got_type (bfd_reloc_code_real_type r_type)
     case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
     case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
     case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
+    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
       return GOT_NORMAL;
 
     case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
@@ -4979,6 +4980,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
        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_MOVW_GOTOFF_G1:
        case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
        case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
          base_got = globals->root.sgot;
@@ -5047,6 +5049,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
              addend = (globals->root.sgot->output_section->vma
                        + globals->root.sgot->output_offset);
              break;
+           case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
            case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
              value = (value - globals->root.sgot->output_section->vma
                       - globals->root.sgot->output_offset);
@@ -5332,6 +5335,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
       break;
 
     case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
+    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
       if (h != NULL)
          value = aarch64_calculate_got_entry_vma (h, globals, info, value,
                                                   output_bfd,
@@ -6479,6 +6483,7 @@ elfNN_aarch64_gc_sweep_hook (bfd *abfd,
        case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
        case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
        case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
+       case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
        case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC:
        case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21:
        case BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21:
@@ -6834,6 +6839,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
            case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
            case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
            case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
+           case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
            case BFD_RELOC_AARCH64_NN:
              if (htab->root.dynobj == NULL)
                htab->root.dynobj = abfd;
@@ -6948,6 +6954,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
        case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
        case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
        case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
+       case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
        case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC:
        case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21:
        case BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21:
diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index c831f600a9ae610a457768f81521c1f778b82695..ac0ec81533a5d6e73af6b827764c1f66ea3b0c05 100644 (file)
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -331,6 +331,7 @@ _bfd_aarch64_elf_put_addend (bfd *abfd,
     case BFD_RELOC_AARCH64_MOVW_G2:
     case BFD_RELOC_AARCH64_MOVW_G2_NC:
     case BFD_RELOC_AARCH64_MOVW_G3:
+    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
     case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G0_NC:
     case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G1_NC:
     case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G0_NC:
@@ -416,6 +417,7 @@ _bfd_aarch64_elf_resolve_relocation (bfd_reloc_code_real_type r_type,
     case BFD_RELOC_AARCH64_MOVW_G2_NC:
     case BFD_RELOC_AARCH64_MOVW_G2_S:
     case BFD_RELOC_AARCH64_MOVW_G3:
+    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
     case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_HI12:
     case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12:
     case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC:
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d1446a7d76aa5cbda84586892ac15a1281dc8c64..b5981b4bbfe3357c0acaab5bd806b37099f8ccca 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-02  Renlin Li  <renlin.li@arm.com>
+
+       * ld-aarch64/emit-relocs-302.d: New.
+       * ld-aarch64/emit-relocs-302.s: New.
+       * ld-aarch64/aarch64-elf.exp: Run the test.
+
 2015-10-02  Renlin Li  <renlin.li@arm.com>
 
        * ld-aarch64/emit-relocs-310.d: New.
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 1f68c17d26b1d2e72eba6a6bfedb157bc03a6a0d..c7d9fbadc65b5d4f285052a19cd0385975b508db 100644 (file)
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -116,7 +116,9 @@ run_dump_test "emit-relocs-286"
 run_dump_test "emit-relocs-286-bad"
 # 287-298 are not done yet
 run_dump_test "emit-relocs-299"
-# 300-308 are not done yet
+# 300-301 are not done yet
+run_dump_test "emit-relocs-302"
+# 303-308 are not done yet
 run_dump_test "emit-relocs-309-up"
 run_dump_test "emit-relocs-309-low"
 run_dump_test "emit-relocs-309-up-bad"
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-302.d b/ld/testsuite/ld-aarch64/emit-relocs-302.d
new file mode 100644 (file)
index 0000000..40ad22b
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-302.d
@@ -0,0 +1,22 @@
+#source: emit-relocs-302.s
+#ld: -T relocs.ld --defsym globala=0x11000 --defsym globalb=0x45000 --defsym globalc=0x1234  -e0 --emit-relocs
+#objdump: -dr
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0000000000010000 <\.text>:
+   10000:      580000e1        ldr     x1, 1001c <\.text\+0x1c>
+   10004:      100000c2        adr     x2, 1001c <\.text\+0x1c>
+   10008:      8b010041        add     x1, x2, x1
+   1000c:      d2a00000        movz    x0, #0x0, lsl #16
+                       1000c: R_AARCH64_MOVW_GOTOFF_G1 globala
+   10010:      d2a00000        movz    x0, #0x0, lsl #16
+                       10010: R_AARCH64_MOVW_GOTOFF_G1 globalb
+   10014:      d2a00000        movz    x0, #0x0, lsl #16
+                       10014: R_AARCH64_MOVW_GOTOFF_G1 globalc
+   10018:      f8606820        ldr     x0, \[x1,x0\]
+   1001c:      0000ffe4        \.word  0x0000ffe4
+                       1001c: R_AARCH64_PREL64 _GLOBAL_OFFSET_TABLE_
+   10020:      00000000        \.word  0x00000000
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-302.s b/ld/testsuite/ld-aarch64/emit-relocs-302.s
new file mode 100644 (file)
index 0000000..b2fd407
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-302.s
@@ -0,0 +1,12 @@
+       .text
+       ldr     x1, .Lgot
+       adr     x2, .Lgot
+       add     x1, x2, x1
+
+       movz    x0, #:gotoff_g1:globala
+       movz    x0, #:gotoff_g1:globalb
+       movz    x0, #:gotoff_g1:globalc
+       ldr     x0, [x1, x0]
+
+.Lgot:
+       .dword _GLOBAL_OFFSET_TABLE_ - .