[AArch64] Use SYMBOL_REFERENCES_LOCAL in one symbol check

For some pc-relative relocations we want to allow them under PIC mode while
a normal global symbol defined in the same dynamic object can still bind
externally through copy relocation.  So, we should not allow pc-relative
relocation against such symbol.

SYMBOL_REFERENCES_LOCAL should be used and is more accurate than the original
individual checks.

bfd/
	* elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Use
	SYMBOL_REFERENCES_LOCAL.
ld/
	* testsuite/ld-aarch64/aarch64-elf.exp: Update test name
	* testsuite/ld-aarch64/pcrel.s: Add new testcases.
	* testsuite/ld-aarch64/pcrel_pic_undefined.d: Update the expected
	warnings.
	* testsuite/ld-aarch64/pcrel_pic_defined_local.d: Rename ...
	* testsuite/ld-aarch64/pcrel_pic_defined.d: ... to this.
	Update expected warnings.
This commit is contained in:
Jiong Wang 2017-06-16 14:20:38 +01:00
parent a87dc45adc
commit d68f19767d
8 changed files with 44 additions and 18 deletions

View File

@ -1,3 +1,8 @@
2017-06-16 Jiong Wang <jiong.wang@arm.com>
* elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Use
SYMBOL_REFERENCES_LOCAL.
2017-06-15 Jiong Wang <jiong.wang@arm.com>
PR ld/21532

View File

@ -5329,15 +5329,15 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
if (bfd_link_pic (info)
&& (input_section->flags & SEC_ALLOC) != 0
&& (input_section->flags & SEC_READONLY) != 0
&& h != NULL
&& !h->def_regular)
&& !SYMBOL_REFERENCES_LOCAL (info, h))
{
int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
_bfd_error_handler
/* xgettext:c-format */
(_("%B: relocation %s against external symbol `%s' can not be used"
" when making a shared object; recompile with -fPIC"),
(_("%B: relocation %s against symbol `%s' which may bind "
"externally can not be used when making a shared object; "
"recompile with -fPIC"),
input_bfd, elfNN_aarch64_howto_table[howto_index].name,
h->root.root.string);
bfd_set_error (bfd_error_bad_value);

View File

@ -1,3 +1,13 @@
2017-06-16 Jiong Wang <jiong.wang@arm.com>
* testsuite/ld-aarch64/aarch64-elf.exp: Update test name
* testsuite/ld-aarch64/pcrel.s: Add new testcases.
* testsuite/ld-aarch64/pcrel_pic_undefined.d: Update the expected
warnings.
* testsuite/ld-aarch64/pcrel_pic_defined_local.d: Rename ...
* testsuite/ld-aarch64/pcrel_pic_defined.d: ... to this.
Update expected warnings.
2017-06-15 H.J. Lu <hongjiu.lu@intel.com>
* exsup.c (elf_shlib_list_options): Display "-z stack-size=SIZE"

View File

@ -195,7 +195,7 @@ run_dump_test_lp64 "local-addend-r"
# test error handling on pcrel relocation for shared libraries.
run_dump_test_lp64 "pcrel_pic_undefined"
run_dump_test_lp64 "pcrel_pic_defined_local"
run_dump_test_lp64 "pcrel_pic_defined"
run_dump_test "limit-b"
run_dump_test "limit-bl"

View File

@ -1,3 +1,4 @@
.hidden global_b
.text
.align 2
main:
@ -18,3 +19,8 @@ main:
.word global_a - .
.xword global_a - .
# Defined global symbol may bind externally because of copy relocation,
# while defined hidden symbol binds locally. LD should be able to
# differenciate this.
adrp x0, :pg_hi21:global_b
.xword global_b - .

View File

@ -0,0 +1,10 @@
#name: PC-Rel relocation against defined
#source: pcrel.s
#ld: -shared -e0 -defsym global_a=0x1000 -defsym global_b=0x2000
#warning: .*: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_ADR_PREL_PG_HI21_NC against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_ADR_PREL_LO21 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_LD_PREL_LO19 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL16 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL32 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL64 against symbol `global_a.*bind externally.*fPIC.*

View File

@ -1,5 +0,0 @@
#name: PC-Rel relocation against defined
#source: pcrel.s
#objdump: -r
#ld: -shared -e0 -defsym global_a=0x1000
#...

View File

@ -1,10 +1,10 @@
#name: PC-Rel relocation against undefined
#source: pcrel.s
#ld: -shared -e0
#warning: .*: relocation R_AARCH64_ADR_PREL_PG_HI21 against external symbol.*fPIC.*
#warning: .*: relocation R_AARCH64_ADR_PREL_PG_HI21_NC against external symbol.*fPIC.*
#warning: .*: relocation R_AARCH64_ADR_PREL_LO21 against external symbol.*fPIC.*
#warning: .*: relocation R_AARCH64_LD_PREL_LO19 against external symbol.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL16 against external symbol.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL32 against external symbol.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL64 against external symbol.*fPIC.*
#ld: -shared -e0 -defsym global_b=0x2000
#warning: .*: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_ADR_PREL_PG_HI21_NC against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_ADR_PREL_LO21 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_LD_PREL_LO19 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL16 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL32 against symbol `global_a.*bind externally.*fPIC.*
#warning: .*: relocation R_AARCH64_PREL64 against symbol `global_a.*bind externally.*fPIC.*