From 13289c10e20281adf480d9822861412a7ade721d Mon Sep 17 00:00:00 2001 From: Jiong Wang Date: Wed, 19 Aug 2015 10:57:34 +0100 Subject: [PATCH] [AArch64][1/6] GAS support BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 2015-08-19 Jiong Wang bfd/ * reloc.c (BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_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_DTPREL_LO12_NC. gas/ * config/tc-aarch64.c (reloc_table): New relocation modifiers. (md_apply_fix): Support BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC. (aarch64_force_relocation): Likewise. gas/testsuite/ * gas/aarch64/reloc-dtprel_lo12_nc.s: New testcase. * gas/aarch64/reloc-dtprel_lo12_nc-ilp32.s: Likewise. * gas/aarch64/reloc-dtprel_lo12_nc.d: New expectation file. * gas/aarch64/reloc-dtprel_lo12_nc-ilp32.d: Likewise. --- bfd/ChangeLog | 8 ++++++++ bfd/bfd-in2.h | 3 +++ bfd/elfnn-aarch64.c | 15 +++++++++++++++ bfd/libbfd.h | 1 + bfd/reloc.c | 4 ++++ gas/ChangeLog | 6 ++++++ gas/config/tc-aarch64.c | 11 +++++++++++ gas/testsuite/ChangeLog | 7 +++++++ gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.d | 10 ++++++++++ gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.s | 5 +++++ gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.d | 9 +++++++++ gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.s | 5 +++++ include/elf/aarch64.h | 1 + 13 files changed, 85 insertions(+) create mode 100644 gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.d create mode 100644 gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.s create mode 100644 gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.d create mode 100644 gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index bcbf7f9..772336f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2015-08-19 Jiong Wang + + * reloc.c (BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_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_DTPREL_LO12_NC. + 2015-08-19 Alan Modra * elf-s390-common.c: Simplify expressions using diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 3299055..1a99ba6 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -5797,6 +5797,9 @@ BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21. */ /* Unsigned 12 bit byte offset to module TLS base address. */ BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12, +/* No overflow check version of BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12. */ + BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC, + /* 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. */ diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index beedb70..9277261 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -1057,6 +1057,21 @@ static reloc_howto_type elfNN_aarch64_howto_table[] = 0xfff, /* dst_mask */ FALSE), /* pcrel_offset */ + /* No overflow check version of BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12. */ + HOWTO (AARCH64_R (TLSLD_ADD_DTPREL_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_DTPREL_LO12_NC), /* name */ + FALSE, /* partial_inplace */ + 0xfff, /* src_mask */ + 0xfff, /* dst_mask */ + FALSE), /* pcrel_offset */ + /* ADD: GOT offset G(S) & 0xff8 [no overflow check] */ HOWTO (AARCH64_R (TLSLD_ADD_LO12_NC), /* type */ 0, /* rightshift */ diff --git a/bfd/libbfd.h b/bfd/libbfd.h index f0eea9e..cdda315 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -2760,6 +2760,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC", "BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19", "BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12", + "BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC", "BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC", "BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21", "BFD_RELOC_AARCH64_TLSLD_ADR_PREL21", diff --git a/bfd/reloc.c b/bfd/reloc.c index 83b7cd2..846befc 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -6848,6 +6848,10 @@ ENUM ENUMDOC Unsigned 12 bit byte offset to module TLS base address. ENUM + BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC +ENUMDOC + No overflow check version of BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12. +ENUM BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC ENUMDOC Unsigned 12 bit byte offset to global offset table entry for a symbols diff --git a/gas/ChangeLog b/gas/ChangeLog index 4064fc1..2ba9c00 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2015-08-19 Jiong Wang + + * config/tc-aarch64.c (reloc_table): New relocation modifiers. + (md_apply_fix): Support BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC. + (aarch64_force_relocation): Likewise. + 2015-08-17 Alan Modra * gas/config/tc-arm.c (s_align): Delete. diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index df37541..d55356f 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -2531,6 +2531,15 @@ static struct reloc_table_entry reloc_table[] = { 0, 0}, + /* Same as dtprel_lo12, no overflow check. */ + {"dtprel_lo12_nc", 0, + 0, /* adr_type */ + 0, + 0, + BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC, + 0, + 0}, + /* Get to the page containing GOT TLS entry for a symbol */ {"gottprel", 0, 0, /* adr_type */ @@ -6797,6 +6806,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg) case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19: case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12: + case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: @@ -7010,6 +7020,7 @@ aarch64_force_relocation (struct fix *fixp) case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19: case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12: + case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index b86a46e..3be3dd1 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2015-08-19 Jiong Wang + + * gas/aarch64/reloc-dtprel_lo12_nc.s: New testcase. + * gas/aarch64/reloc-dtprel_lo12_nc-ilp32.s: Likewise. + * gas/aarch64/reloc-dtprel_lo12_nc.d: New expectation file. + * gas/aarch64/reloc-dtprel_lo12_nc-ilp32.d: Likewise. + 2015-08-13 Andre Vieira * gas/arm/nops.d: New. diff --git a/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.d b/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.d new file mode 100644 index 0000000..b232b2f --- /dev/null +++ b/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.d @@ -0,0 +1,10 @@ +#as: -mabi=ilp32 +#objdump: -dr + +.*: file format .* + +Disassembly of section \.text: + +00000000 <.*>: + 0: 110002a8 add w8, w21, #0x0 + 0: R_AARCH64_P32_TLSLD_ADD_DTPREL_LO12_NC x diff --git a/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.s b/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.s new file mode 100644 index 0000000..34226a5 --- /dev/null +++ b/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc-ilp32.s @@ -0,0 +1,5 @@ +// Test file for AArch64 GAS -- dtprel_lo12_nc ILP32 + +func: + // BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC + add w8, w21, #:dtprel_lo12_nc:x diff --git a/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.d b/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.d new file mode 100644 index 0000000..795fb0b --- /dev/null +++ b/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.d @@ -0,0 +1,9 @@ +#objdump: -dr + +.*: file format .* + +Disassembly of section \.text: + +0000000000000000 <.*>: + 0: 91000347 add x7, x26, #0x0 + 0: R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC x diff --git a/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.s b/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.s new file mode 100644 index 0000000..187309f --- /dev/null +++ b/gas/testsuite/gas/aarch64/reloc-dtprel_lo12_nc.s @@ -0,0 +1,5 @@ +// Test file for AArch64 GAS -- dtprel_lo12_nc + +func: + // BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC + add x7, x26, #:dtprel_lo12_nc:x diff --git a/include/elf/aarch64.h b/include/elf/aarch64.h index 8e23278..c297ebc 100644 --- a/include/elf/aarch64.h +++ b/include/elf/aarch64.h @@ -133,6 +133,7 @@ RELOC_NUMBER (R_AARCH64_P32_TLSLD_ADR_PREL21, 83) RELOC_NUMBER (R_AARCH64_P32_TLSLD_ADR_PAGE21, 84) RELOC_NUMBER (R_AARCH64_P32_TLSLD_ADD_LO12_NC, 85) RELOC_NUMBER (R_AARCH64_P32_TLSLD_ADD_DTPREL_LO12, 91) +RELOC_NUMBER (R_AARCH64_P32_TLSLD_ADD_DTPREL_LO12_NC, 92) RELOC_NUMBER (R_AARCH64_P32_TLSIE_ADR_GOTTPREL_PAGE21, 103) RELOC_NUMBER (R_AARCH64_P32_TLSIE_LD32_GOTTPREL_LO12_NC, 104) RELOC_NUMBER (R_AARCH64_P32_TLSIE_LD_GOTTPREL_PREL19, 105) -- 2.7.4