projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 56a2e45)
[AArch64][5/8] GAS support BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC
authorJiong Wang <jiong.wang@arm.com>
Tue, 11 Aug 2015 16:15:56 +0000 (17:15 +0100)
committerJiong Wang <jiong.wang@arm.com>
Tue, 11 Aug 2015 20:25:51 +0000 (21:25 +0100)
2015-08-11  Jiong Wang  <jiong.wang@arm.com>

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

gas/
  * config/tc-aarch64.c (reloc_table): New relocation modifiers.
  (md_apply_fix): Support BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC.
  (aarch64_force_relocation): Likewise.

gas/testsuite/
  * gas/aarch64/reloc-tlsldm_lo12_nc-1.s: New testcase.
  * gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s: Likewise.
  * gas/aarch64/reloc-tlsldm_lo12_nc-1.d: New expectation file.
  * gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d: Likewise.

12 files changed:
bfd/ChangeLog patch | blob | history
bfd/bfd-in2.h patch | blob | history
bfd/elfnn-aarch64.c patch | blob | history
bfd/libbfd.h patch | blob | history
bfd/reloc.c patch | blob | history
gas/ChangeLog patch | blob | history
gas/config/tc-aarch64.c patch | blob | history
gas/testsuite/ChangeLog patch | blob | history
gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.d [new file with mode: 0644] patch | blob
gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.s [new file with mode: 0644] patch | blob
gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d [new file with mode: 0644] patch | blob
gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s [new file with mode: 0644] patch | blob

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 01a29c842254165a33f5a25782d22f06044c8b69..6e12da30ef0dbe0290f15e39880f79f05cf0830d 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-11  Jiong Wang  <jiong.wang@arm.com>
+
+       * reloc.c (BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC): New entry.
+       * bfd-in2.h: Regenerate.
+       * libbfd.h: Regenerate.
+       * elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for
+       BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC.
+
 2015-08-11  Jiong Wang  <jiong.wang@arm.com>
 
        * elfnn-aarch64.c (IS_AARCH64_TLS_RELOC): Recognize
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 43e1324cced755e84fc42c3d26f398df4cc1e765..350b9551a45d86f7ba77ef73409f05d738a883cd 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5794,6 +5794,11 @@ BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21.  */
 /* AArch64 TLS INITIAL EXEC relocation.  */
   BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19,
 
+/* Unsigned 12 bit byte offset to global offset table entry for a symbols
+tls_index structure.  Used in conjunction with
+BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21.  */
+  BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC,
+
 /* GOT entry page address for AArch64 TLS Local Dynamic, used with ADRP
 instruction.  */
   BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21,
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index ff56701614fa6f64d20cee12e8280bf5694da883..12c1220fb9901ca0e0d4598fd0e80fde3ff1eea6 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -1026,6 +1026,21 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
         0x1ffffc,              /* dst_mask */
         FALSE),                /* pcrel_offset */
 
+  /* ADD: GOT offset G(S) & 0xff8 [no overflow check] */
+  HOWTO (AARCH64_R (TLSLD_ADD_LO12_NC),        /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        12,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_dont,        /* complain_on_overflow */
+        bfd_elf_generic_reloc, /* special_function */
+        AARCH64_R_STR (TLSLD_ADD_LO12_NC),     /* name */
+        FALSE,                 /* partial_inplace */
+        0xfff,                 /* src_mask */
+        0xfff,                 /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
   /* Get to the page for the GOT entry for the symbol
      (G(S) - P) using an ADRP instruction.  */
   HOWTO (AARCH64_R (TLSLD_ADR_PAGE21), /* type */
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 03e9393cfe53132f3eb54770ff9873d9acbfe7b4..d6ed8fda890ede569ff89bb94fda6baedaf0f9d2 100644 (file)
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2759,6 +2759,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC",
   "BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC",
   "BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19",
+  "BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC",
   "BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21",
   "BFD_RELOC_AARCH64_TLSLD_ADR_PREL21",
   "BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G2",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index d6252c850677a560e45efb9b841f8258e0e53d9a..df22f9bf283cfbc3ed732ecb61de0cfbc045d3b6 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -6843,6 +6843,12 @@ ENUM
   BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19
 ENUMDOC
   AArch64 TLS INITIAL EXEC relocation.
+ENUM
+  BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC
+ENUMDOC
+  Unsigned 12 bit byte offset to global offset table entry for a symbols
+  tls_index structure.  Used in conjunction with
+  BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21.
 ENUM
   BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21
 ENUMDOC
diff --git a/gas/ChangeLog b/gas/ChangeLog
index a97108a5f25db6dea7c62de04a69a3fe00fb3a78..314735a527c2899f394baa111d6553b9e7c414c7 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-11  Jiong Wang  <jiong.wang@arm.com>
+
+       * config/tc-aarch64.c (reloc_table): New relocation modifiers.
+       (md_apply_fix): Support BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC.
+       (aarch64_force_relocation): Likewise.
+
 2015-08-11  Jiong Wang  <jiong.wang@arm.com>
 
        * config/tc-aarch64.c (reloc_table): New relocation modifiers.
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index c01ec6dbd0f549d5c703069d69a2bc6f2aa2b956..a633b04fd84695d270b616bf41e4b2603fe33d45 100644 (file)
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -2513,6 +2513,15 @@ static struct reloc_table_entry reloc_table[] = {
    0,
    0},
 
+  /* 12 bit offset into the page containing GOT TLS entry for a symbol */
+  {"tlsldm_lo12_nc", 0,
+   0,                          /* adr_type */
+   0,
+   0,
+   BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC,
+   0,
+   0},
+
   /* Get to the page containing GOT TLS entry for a symbol */
   {"gottprel", 0,
    0,                          /* adr_type */
@@ -6778,6 +6787,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg)
     case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC:
     case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
     case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19:
+    case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC:
     case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21:
     case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
@@ -6989,6 +6999,7 @@ aarch64_force_relocation (struct fix *fixp)
     case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC:
     case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
     case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19:
+    case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC:
     case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21:
     case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b790d4a8adffded78b6d342f56f786ce8527c67e..9449f1d4ed588c1722e4ef84e3e24c4cae49e658 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-11  Jiong Wang  <jiong.wang@arm.com>
+
+       * gas/aarch64/reloc-tlsldm_lo12_nc-1.s: New testcase.
+       * gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s: Likewise.
+       * gas/aarch64/reloc-tlsldm_lo12_nc-1.d: New expectation file.
+       * gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d: Likewise.
+
 2015-08-11  Jiong Wang  <jiong.wang@arm.com>
 
        * gas/aarch64/reloc-tlsldm-page-1.s: New testcase.
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.d b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.d
new file mode 100644 (file)
index 0000000..9054036
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.d
@@ -0,0 +1,10 @@
+#objdump: -dr
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+0000000000000000 <.*>:
+   0:  91000000        add     x0, x0, #0x0
+                       0: R_AARCH64_TLSLD_ADD_LO12_NC  x
+
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.s b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.s
new file mode 100644 (file)
index 0000000..676bbfc
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.s
@@ -0,0 +1,5 @@
+// Test file for AArch64 GAS -- reloc 519
+
+func:
+       // BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC
+       add  x0, x0, #:tlsldm_lo12_nc:x
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d
new file mode 100644 (file)
index 0000000..f068cfb
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d
@@ -0,0 +1,11 @@
+#as: -mabi=ilp32
+#objdump: -dr
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+00000000 <.*>:
+   0:  91000000        add     x0, x0, #0x0
+                       0: R_AARCH64_P32_TLSLD_ADD_LO12_NC      x
+
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s
new file mode 100644 (file)
index 0000000..2556276
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s
@@ -0,0 +1,5 @@
+// Test file for AArch64 GAS -- reloc 85
+
+func:
+       // BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC
+       add  x0, x0, #:tlsldm_lo12_nc:x