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]

[3/16][binutils][AARCH64]Add relocation support for large memory model. [GAS] Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G1 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:19:34 +0100
Subject: [3/16][binutils][AARCH64]Add relocation support for large memory model. [GAS] Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G1 Support
Authentication-results: sourceware.org; auth=none

Hi all,

This patch adds BFD_RELOC_AARCH64_MOVW_GOTOFF_G1 support into Gas.

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 srcmovk t0, #:gotoff_g0_nc:src //R_AARCH64_MOVW_GOTOFF_G0_NC src

        ldr     t0, [gp, t0]

gas checked without any issues, Okay to commit?


bfd/ChangeLog:

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

    * reloc.c (BFD_RELOC_AARCH64_MOVW_GOTOFF_G1): New.
    * elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for
        MOVW_GOTOFF_G1.
    * libbfd.h: Regenerate.
    * bfd-in2.h: Regenerate.

gas/ChangeLog:

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

    * config/tc-aarch64.c (reloc_table): New relocation modifier
        gotoff_g1.
    (process_movw_reloc_info): Support newly added modifier.
    (md_apply_fix): Likewise.

gas/testsuite/ChangeLog:

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

    * gas/aarch64/reloc-gotoff_g1.s: New.
    * gas/aarch64/reloc-gotoff_g1.d: New.

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index a8aebd2..5c444c7 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5752,6 +5752,10 @@ the GOT entry for this symbol.  Used in conjunction with
 BFD_RELOC_AARCH64_ADR_GOTPAGE.  Valid in ILP32 ABI only.  */
   BFD_RELOC_AARCH64_LD32_GOT_LO12_NC,
 
+/* Unsigned 16 bit byte higher offset for 64 bit load/store from the GOT entry
+for this symbol.  Valid in LP64 ABI only.  */
+  BFD_RELOC_AARCH64_MOVW_GOTOFF_G1,
+
 /* Unsigned 15 bit byte offset for 64 bit load/store from the page of
 the GOT entry for this symbol.  Valid in LP64 ABI only.  */
   BFD_RELOC_AARCH64_LD64_GOTOFF_LO15,
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 19a94ad..348ff3d 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -866,6 +866,21 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
 	 0xffc,			/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
+  /* Higher 16 bits of GOT offset for the symbol.  */
+  HOWTO64 (AARCH64_R (MOVW_GOTOFF_G1),	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 AARCH64_R_STR (MOVW_GOTOFF_G1),	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
   /* LD64: GOT offset for the symbol.  */
   HOWTO64 (AARCH64_R (LD64_GOTOFF_LO15),	/* type */
 	 3,			/* rightshift */
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index f0eea9e..42476dd 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2747,6 +2747,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_AARCH64_ADR_GOT_PAGE",
   "BFD_RELOC_AARCH64_LD64_GOT_LO12_NC",
   "BFD_RELOC_AARCH64_LD32_GOT_LO12_NC",
+  "BFD_RELOC_AARCH64_MOVW_GOTOFF_G1",
   "BFD_RELOC_AARCH64_LD64_GOTOFF_LO15",
   "BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14",
   "BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index b845f50..f85d95e 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -6790,6 +6790,11 @@ ENUMDOC
   the GOT entry for this symbol.  Used in conjunction with
   BFD_RELOC_AARCH64_ADR_GOTPAGE.  Valid in ILP32 ABI only.
 ENUM
+  BFD_RELOC_AARCH64_MOVW_GOTOFF_G1
+ENUMDOC
+  Unsigned 16 bit byte higher offset for 64 bit load/store from the GOT entry
+  for this symbol.  Valid in LP64 ABI only.
+ENUM
   BFD_RELOC_AARCH64_LD64_GOTOFF_LO15
 ENUMDOC
   Unsigned 15 bit byte offset for 64 bit load/store from the page of
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index df37541..9888f81 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -2455,6 +2455,15 @@ static struct reloc_table_entry reloc_table[] = {
    BFD_RELOC_AARCH64_LD_GOT_LO12_NC,
    0},
 
+  /* Most significant bits 16-31 of address/value: MOVZ.  */
+  {"gotoff_g1", 0,
+   0,				/* adr_type */
+   0,
+   BFD_RELOC_AARCH64_MOVW_GOTOFF_G1,
+   0,
+   0,
+   0},
+
   /* 15 bit offset into the page containing GOT entry for that symbol.  */
   {"gotoff_lo15", 0,
    0,				/* adr_type */
@@ -4611,6 +4620,7 @@ process_movw_reloc_info (void)
     case BFD_RELOC_AARCH64_MOVW_G1:
     case BFD_RELOC_AARCH64_MOVW_G1_NC:
     case BFD_RELOC_AARCH64_MOVW_G1_S:
+    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
     case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1:
     case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1_NC:
       shift = 16;
@@ -6694,6 +6704,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg)
     case BFD_RELOC_AARCH64_MOVW_G1:
     case BFD_RELOC_AARCH64_MOVW_G1_NC:
     case BFD_RELOC_AARCH64_MOVW_G1_S:
+    case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
       scale = 16;
       goto movw_common;
     case BFD_RELOC_AARCH64_MOVW_G2:
@@ -6724,6 +6735,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg)
 		case BFD_RELOC_AARCH64_MOVW_G1:
 		case BFD_RELOC_AARCH64_MOVW_G2:
 		case BFD_RELOC_AARCH64_MOVW_G3:
+		case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1:
 		  if (unsigned_overflow (value, scale + 16))
 		    as_bad_where (fixP->fx_file, fixP->fx_line,
 				  _("unsigned value out of range"));
diff --git a/gas/testsuite/gas/aarch64/reloc-gotoff_g1.d b/gas/testsuite/gas/aarch64/reloc-gotoff_g1.d
new file mode 100644
index 0000000..43e1ee4
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-gotoff_g1.d
@@ -0,0 +1,9 @@
+#objdump: -dr
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+0000000000000000 <.*>:
+   0:	d2a0001c 	movz	x28, #0x0, lsl #16
+			0: R_AARCH64_MOVW_GOTOFF_G1	x
diff --git a/gas/testsuite/gas/aarch64/reloc-gotoff_g1.s b/gas/testsuite/gas/aarch64/reloc-gotoff_g1.s
new file mode 100644
index 0000000..f1036a1
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-gotoff_g1.s
@@ -0,0 +1,5 @@
+// Test file for AArch64 GAS -- gotoff_g1
+
+func:
+	// BFD_RELOC_AARCH64_MOVW_GOTOFF_G1
+	movz    x28, #:gotoff_g1:x

Follow-Ups:
- Re: [3/16][binutils][AARCH64]Add relocation support for large memory model. [GAS] Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G1 Support
  - From: Nick Clifton

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