This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[4/16][binutils][AARCH64]Add relocation support for large memory model. [LD]Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC Support.

From: Renlin Li <renlin dot li at arm dot com>
To: "binutils at sourceware dot org" <binutils at sourceware dot org>
Cc: Nicholas Clifton <nickc at redhat dot com>, Marcus Shawcroft <Marcus dot Shawcroft at arm dot com>, Jiong Wang <jiong dot wang at arm dot com>
Date: Tue, 08 Sep 2015 17:23:45 +0100
Subject: [4/16][binutils][AARCH64]Add relocation support for large memory model. [LD]Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC Support.
Authentication-results: sourceware.org; auth=none

Hi all,

This patch add BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC to binutils linker.

It's used in large memory model, GOT PIC addressing.

For the large model and -fPIC, the GOT is limited to 4GB, allowing it tobe accessed using a 32-bit unsigned register index.


// gp = &_GOT_
movz t0, #:gotoff_g1:src // R_AARCH64_MOVW_GOTOFF_G1 src
movk t0, #:gotoff_g0_nc:src // R_AARCH64_MOVW_GOTOFF_G0_NC src
ldr     t0, [gp, t0]


LD tests Okay without any issues. Okay to commit?

bfd/ChangeLog:

2015-09-08  Renlin Li  <renlin.li@arm.com>

    * elfnn-aarch64.c (aarch64_reloc_got_type): Add
        BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC support.
    (elfNN_aarch64_final_link_relocate): Likewise.
    (elfNN_aarch64_relocate_section): Likewise.
    (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.

ld/testsuite/ChangeLog:

2015-09-08  Renlin Li  <renlin.li@arm.com>

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

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 348ff3d..0ef417c 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -4184,6 +4184,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:
@@ -4731,6 +4732,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;
@@ -4799,6 +4801,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);
@@ -5084,6 +5087,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,
@@ -6171,6 +6175,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:
@@ -6526,6 +6531,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;
@@ -6640,6 +6646,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 9f10f55..82f45ae 100644
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -318,6 +318,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_TLSLE_MOVW_TPREL_G0_NC:
     case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1_NC:
       contents = reencode_movw_imm (contents, addend);
@@ -401,6 +402,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_LO12:
       value = value + addend;
       break;
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 0094af2..38fa70e 100644
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -109,7 +109,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
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
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_ - .

Follow-Ups:
- Re: [4/16][binutils][AARCH64]Add relocation support for large memory model. [LD]Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC Support.
  - From: Renlin Li

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]