diff options
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 3 | ||||
| -rw-r--r-- | bfd/elfnn-aarch64.c | 16 | ||||
| -rw-r--r-- | bfd/libbfd.h | 1 | ||||
| -rw-r--r-- | bfd/reloc.c | 4 | ||||
| -rw-r--r-- | gas/ChangeLog | 7 | ||||
| -rw-r--r-- | gas/config/tc-aarch64.c | 13 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/aarch64/reloc-tlsgd_g1.d | 9 | ||||
| -rw-r--r-- | gas/testsuite/gas/aarch64/reloc-tlsgd_g1.s | 4 |
10 files changed, 70 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c31c855..329c42c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,13 @@ 2015-10-02 Renlin Li <renlin.li@arm.com> + * reloc.c (BFD_RELOC_AARCH64_TLSGD_MOVW_G1): New entry. + * elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for + BFD_RELOC_AARCH64_TLSGD_MOVW_G1. + * bfd-in2.h: Regenerate. + * libbfd.h: Likewise. + +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. diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 6cd47ec..39c1af2 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -5786,6 +5786,9 @@ tls_index structure. Used in conjunction with BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21. */ BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC, +/* AArch64 TLS General Dynamic relocation. */ + BFD_RELOC_AARCH64_TLSGD_MOVW_G1, + /* AArch64 TLS INITIAL EXEC relocation. */ BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G1, diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 1747ae4..8f3f75c 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -168,6 +168,7 @@ ((R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADR_PREL21 \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_MOVW_G1 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC \ @@ -1006,6 +1007,21 @@ static reloc_howto_type elfNN_aarch64_howto_table[] = 0xfff, /* dst_mask */ FALSE), /* pcrel_offset */ + /* Higher 16 bits of GOT offset to tls_index. */ + HOWTO64 (AARCH64_R (TLSGD_MOVW_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 (TLSGD_MOVW_G1), /* name */ + FALSE, /* partial_inplace */ + 0xffff, /* src_mask */ + 0xffff, /* dst_mask */ + FALSE), /* pcrel_offset */ + HOWTO64 (AARCH64_R (TLSIE_MOVW_GOTTPREL_G1), /* type */ 16, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 9483c0a..93bdc5d 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -2755,6 +2755,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21", "BFD_RELOC_AARCH64_TLSGD_ADR_PREL21", "BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC", + "BFD_RELOC_AARCH64_TLSGD_MOVW_G1", "BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G1", "BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC", "BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21", diff --git a/bfd/reloc.c b/bfd/reloc.c index cec9a1f..b32a2e2 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -6830,6 +6830,10 @@ ENUMDOC tls_index structure. Used in conjunction with BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21. ENUM + BFD_RELOC_AARCH64_TLSGD_MOVW_G1 +ENUMDOC + AArch64 TLS General Dynamic relocation. +ENUM BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G1 ENUMDOC AArch64 TLS INITIAL EXEC relocation. diff --git a/gas/ChangeLog b/gas/ChangeLog index 63b9805..8d0908f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,12 @@ 2015-10-02 Renlin Li <renlin.li@arm.com> + * config/tc-aarch64.c (reloc_table): New relocation modifier tlsgd_g1. + (process_movw_reloc_info): Support BFD_RELOC_AARCH64_TLSGD_MOVW_G1. + (md_apply_fix): Likewise. + (aarch64_force_relocation): Likewise. + +2015-10-02 Renlin Li <renlin.li@arm.com> + * config/tc-aarch64.c (reloc_table): New relocation modifier gotoff_g0_nc. (process_movw_reloc_info): Support gotoff_g0_nc. diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index 1b62b39..5716ef0 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -2500,6 +2500,15 @@ static struct reloc_table_entry reloc_table[] = { 0, 0}, + /* Most significant bits 16-31 of address/value: MOVZ. */ + {"tlsgd_g1", 0, + 0, /* adr_type */ + 0, + BFD_RELOC_AARCH64_TLSGD_MOVW_G1, + 0, + 0, + 0}, + /* Get to the page containing GOT TLS entry for a symbol */ {"tlsdesc", 0, BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21, /* adr_type */ @@ -4670,6 +4679,7 @@ process_movw_reloc_info (void) case BFD_RELOC_AARCH64_MOVW_G0_S: case BFD_RELOC_AARCH64_MOVW_G1_S: case BFD_RELOC_AARCH64_MOVW_G2_S: + case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G0: case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1: case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G2: @@ -4696,6 +4706,7 @@ process_movw_reloc_info (void) 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_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G1: case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G1_NC: case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1: @@ -6915,6 +6926,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg) case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSGD_ADR_PREL21: + case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: @@ -7143,6 +7155,7 @@ aarch64_force_relocation (struct fix *fixp) case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSGD_ADR_PREL21: + case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 585d354..cf9e0da 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2015-10-02 Renlin Li <renlin.li@arm.com> + * gas/aarch64/reloc-tlsgd_g1.s: New. + * gas/aarch64/reloc-tlsgd_g1.s: New. + +2015-10-02 Renlin Li <renlin.li@arm.com> + * gas/aarch64/reloc-gotoff_g0_nc.s: New. * gas/aarch64/reloc-gotoff_g0_nc.d: New. diff --git a/gas/testsuite/gas/aarch64/reloc-tlsgd_g1.d b/gas/testsuite/gas/aarch64/reloc-tlsgd_g1.d new file mode 100644 index 0000000..7063f4e --- /dev/null +++ b/gas/testsuite/gas/aarch64/reloc-tlsgd_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_TLSGD_MOVW_G1 var diff --git a/gas/testsuite/gas/aarch64/reloc-tlsgd_g1.s b/gas/testsuite/gas/aarch64/reloc-tlsgd_g1.s new file mode 100644 index 0000000..12f73cd --- /dev/null +++ b/gas/testsuite/gas/aarch64/reloc-tlsgd_g1.s @@ -0,0 +1,4 @@ +func: + + // R_AARCH64_TLSGD_MOVW_G1 var + movz x28, #:tlsgd_g1:var |