[LD][AARCH64]Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC Support.

bfd/

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

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

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

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

7 files changed, 61 insertions, 1 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2f7e584..c31c855 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,15 @@
 2015-10-02  Renlin Li  <renlin.li@arm.com>
 
+	* elfnn-aarch64.c (aarch64_reloc_got_type): Add
+	BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC support.
+	(elfNN_aarch64_final_link_relocate): 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.
+
+2015-10-02  Renlin Li  <renlin.li@arm.com>
+
 	* reloc.c (BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC): New.
 	* elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry
 	MOVW_GOTOFF_G0_NC.
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 49d6eee..1747ae4 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -4447,6 +4447,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_G0_NC:
     case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
       return GOT_NORMAL;
 
@@ -4995,6 +4996,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_G0_NC:
 	case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
 	case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
 	case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
@@ -5064,6 +5066,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_G0_NC:
 	    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
 	    case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
 	      value = (value - globals->root.sgot->output_section->vma
@@ -5350,6 +5353,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
       break;
 
     case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15:
+    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC:
     case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
       if (h != NULL)
 	  value = aarch64_calculate_got_entry_vma (h, globals, info, value,
@@ -6498,6 +6502,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_G0_NC:
 	case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
 	case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC:
 	case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21:
@@ -6854,6 +6859,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_G0_NC:
 	    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
 	    case BFD_RELOC_AARCH64_NN:
 	      if (htab->root.dynobj == NULL)
@@ -6969,6 +6975,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_G0_NC:
 	case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
 	case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC:
 	case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21:
diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index ac0ec81..5fe1b07 100644
--- 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_G0_NC:
     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:
@@ -417,6 +418,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_G0_NC:
     case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
     case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_HI12:
     case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12:
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b5981b4..a6d4a3b 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2015-10-02  Renlin Li  <renlin.li@arm.com>
 
+	* ld-aarch64/aarch64-elf.exp: Run new test.
+	* ld-aarch64/emit-relocs-301.d: New.
+	* ld-aarch64/emit-relocs-301.s: New.
+
+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.
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index c7d9fba..4c41bc9 100644
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -116,7 +116,8 @@ 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-301 are not done yet
+# 300 is not done yet
+run_dump_test "emit-relocs-301"
 run_dump_test "emit-relocs-302"
 # 303-308 are not done yet
 run_dump_test "emit-relocs-309-up"
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-301.d b/ld/testsuite/ld-aarch64/emit-relocs-301.d
new file mode 100644
index 0000000..305a9f8
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-301.d
@@ -0,0 +1,22 @@
+#source: emit-relocs-301.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:	f2800200 	movk	x0, #0x10
+			1000c: R_AARCH64_MOVW_GOTOFF_G0_NC	globala
+   10010:	f2800300 	movk	x0, #0x18
+			10010: R_AARCH64_MOVW_GOTOFF_G0_NC	globalb
+   10014:	f2800100 	movk	x0, #0x8
+			10014: R_AARCH64_MOVW_GOTOFF_G0_NC	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-301.s b/ld/testsuite/ld-aarch64/emit-relocs-301.s
new file mode 100644
index 0000000..d17d4ce
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-301.s
@@ -0,0 +1,12 @@
+	.text
+	ldr	x1, .Lgot
+	adr	x2, .Lgot
+	add	x1, x2, x1
+
+	movk	x0, #:gotoff_g0_nc:globala
+	movk	x0, #:gotoff_g0_nc:globalb
+	movk	x0, #:gotoff_g0_nc:globalc
+	ldr	x0, [x1, x0]
+
+.Lgot:
+	.dword _GLOBAL_OFFSET_TABLE_ - .