darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[AArch64][3/3] LD support BFD_RELOC_AARCH64_TLSLD_ADR_PREL21

Browse source
This commit is contained in:
Jiong Wang 2015-07-16 15:46:21 +01:00
parent 6c37fedc41
commit 77a69ff840
7 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bfd/ChangeLog
View file

@ -1,3 +1,15 @@
2015-07-16 Jiong Wang <jiong.wang@arm.com>
* elfnn-aarch64.c (IS_AARCH64_TLS_RELOC): Recognize
BFD_RELOC_AARCH64_TLSLD_ADR_PREL21.
(aarch64_reloc_got_type): Ditto.
(elfNN_aarch64_final_link_relocate): Ditto.
(elfNN_aarch64_relocate_section): Ditto.
(elfNN_aarch64_gc_sweep_hook): Ditto.
(elfNN_aarch64_check_relocs): Ditto.
* elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Ditto.
(_bfd_aarch64_elf_resolve_relocation): Ditto.
2015-07-16 Jiong Wang <jiong.wang@arm.com>
* reloc.c (BFD_RELOC_AARCH64_TLSLD_ADR_PREL21): New entry.

18
bfd/elfnn-aarch64.c
View file

@ -174,6 +174,7 @@
|| (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC \
|| (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC \
|| (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19 \
|| (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADR_PREL21 \
|| (R_TYPE) == BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12 \
|| (R_TYPE) == BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12 \
|| (R_TYPE) == BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12_NC \
@ -4105,6 +4106,7 @@ aarch64_reloc_got_type (bfd_reloc_code_real_type r_type)
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_TLSLD_ADR_PREL21:
return GOT_TLS_GD;
case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC:
@ -5011,6 +5013,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
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_ADR_PREL21:
if (globals->root.sgot == NULL)
return bfd_reloc_notsupported;
@ -5495,6 +5498,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
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_TLSLD_ADR_PREL21:
if (! symbol_got_offset_mark_p (input_bfd, h, r_symndx))
{
bfd_boolean need_relocs = FALSE;
@ -5527,7 +5531,17 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
* RELOC_SIZE (htab);
bfd_elfNN_swap_reloca_out (output_bfd, &rela, loc);
if (indx == 0)
if (elfNN_aarch64_bfd_reloc_from_type (r_type)
== BFD_RELOC_AARCH64_TLSLD_ADR_PREL21)
{
/* For local dynamic, don't generate DTPREL in any case.
Initialize the DTPREL slot into zero, so we get module
base address when invoke runtime TLS resolver. */
bfd_put_NN (output_bfd, 0,
globals->root.sgot->contents + off
+ GOT_ENTRY_SIZE);
}
else if (indx == 0)
{
bfd_put_NN (output_bfd,
relocation - dtpoff_base (info),
@ -6011,6 +6025,7 @@ elfNN_aarch64_gc_sweep_hook (bfd *abfd,
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_ADR_PREL21:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
@ -6483,6 +6498,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
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_ADR_PREL21:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12_NC:

2
bfd/elfxx-aarch64.c
View file

@ -241,6 +241,7 @@ _bfd_aarch64_elf_put_addend (bfd *abfd,
case BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21:
case BFD_RELOC_AARCH64_TLSGD_ADR_PREL21:
case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
contents = _bfd_aarch64_reencode_adr_imm (contents, addend);
break;
@ -371,6 +372,7 @@ _bfd_aarch64_elf_resolve_relocation (bfd_reloc_code_real_type r_type,
case BFD_RELOC_AARCH64_TLSDESC_LD_PREL19:
case BFD_RELOC_AARCH64_TLSGD_ADR_PREL21:
case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19:
case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
case BFD_RELOC_AARCH64_TSTBR14:
if (weak_undef_p)
value = place;

6
ld/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2015-07-16 Jiong Wang <jiong.wang@arm.com>
* ld-aarch64/tls-tiny-ld.s: New file.
* ld-aarch64/tls-tiny-ld.d: Ditto.
* ld-aarch64/aarch64-elf.exp: Run new test.
2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
* ld-elf/zlibbegin.rS: Updated to .debug_.* with the

1
ld/testsuite/ld-aarch64/aarch64-elf.exp
View file

@ -146,6 +146,7 @@ run_dump_test "tls-tiny-desc"
run_dump_test "tls-tiny-desc-ie"
run_dump_test "tls-tiny-desc-le"
run_dump_test "tls-tiny-ie"
run_dump_test "tls-tiny-ld"
run_dump_test "tlsle"
run_dump_test "tlsle-symbol-offset"
run_dump_test "gc-got-relocs"

8
ld/testsuite/ld-aarch64/tls-tiny-ld.d Normal file
View file

@ -0,0 +1,8 @@
#source: tls-tiny-ld.s
#ld: -T relocs.ld -shared
#readelf: -Wr
Relocation section '\.rela\.dyn' at offset 0x10070 contains 2 entries:
Offset Info Type Symbol's Value Symbol's Name \+ Addend
0000000000000000 0000000000000000 R_AARCH64_NONE 0
0000000000020008 0000000200000404 R_AARCH64_TLS_DTPMOD64 0000000000000000 dummy \+ 0

7
ld/testsuite/ld-aarch64/tls-tiny-ld.s Normal file
View file

@ -0,0 +1,7 @@
// Test file for AArch64 LD -- tlsldm
.text
func:
add x1, x2, x3
// BFD_RELOC_AARCH64_TLSLD_ADR_PREL21
adr x0, :tlsldm:dummy