mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-11 19:33:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PR ld/21900: MIPS: Fix relocation processing with undefined symbols

Browse Source 
Currently, when `mips_elf_calculate_relocation' is asked to relocate an
undefined symbol, it reports an error or a warning and immediately
returns without performing the relocation.  This is fine if the link
fails, but if unresolved_syms_in_objects == RM_GENERATE_WARNING, the
link will continue and output some unrelocated code, which is a
regression from commit e7e2196da3 ("MIPS/BFD: Correctly report
undefined relocations").

Fix this by continuing after calling the `undefined_symbol' hook unless
this is an error condition.

	bfd/
	PR ld/21900
	* elfxx-mips.c (mips_elf_calculate_relocation): Only return
	after calling `undefined_symbol' hook if this is an error
	condition.  Assume the value of 0 for the symbol requested
	otherwise.

	ld/
	PR ld/21900
	* testsuite/ld-mips-elf/undefined-warn.d: New test.
	* testsuite/ld-mips-elf/undefined.s: Add padding at the end.
	* testsuite/ld-mips-elf/mips-elf.exp: Run the new test.
This commit is contained in:
James Cowgill 2018-03-03 15:49:21 +00:00 committed by Maciej W. Rozycki
parent b9671caf8f
commit dfb93f1158
6 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bfd/ChangeLog
View File

@ -1,3 +1,12 @@
2018-03-03 James Cowgill <james.cowgill@mips.com>
Maciej W. Rozycki <macro@mips.com>
PR ld/21900
* elfxx-mips.c (mips_elf_calculate_relocation): Only return
after calling `undefined_symbol' hook if this is an error
condition. Assume the value of 0 for the symbol requested
otherwise.
2018-03-02 Jim Wilson <jimw@sifive.com>
PR 22903

14
bfd/elfxx-mips.c
View File

@ -5478,12 +5478,18 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
}
else
{
bfd_boolean reject_undefined
= (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
|| ELF_ST_VISIBILITY (h->root.other) != STV_DEFAULT);
(*info->callbacks->undefined_symbol)
(info, h->root.root.root.string, input_bfd,
input_section, relocation->r_offset,
(info->unresolved_syms_in_objects == RM_GENERATE_ERROR)
|| ELF_ST_VISIBILITY (h->root.other));
return bfd_reloc_undefined;
input_section, relocation->r_offset, reject_undefined);
if (reject_undefined)
return bfd_reloc_undefined;
symbol = 0;
}
target_is_16_bit_code_p = ELF_ST_IS_MIPS16 (h->root.other);

8
ld/ChangeLog
View File

@ -1,3 +1,11 @@
2018-03-03 James Cowgill <james.cowgill@mips.com>
Maciej W. Rozycki <macro@mips.com>
PR ld/21900
* testsuite/ld-mips-elf/undefined-warn.d: New test.
* testsuite/ld-mips-elf/undefined.s: Add padding at the end.
* testsuite/ld-mips-elf/mips-elf.exp: Run the new test.
2018-03-02 Jim Wilson <jimw@sifive.com>
PR 22903

1
ld/testsuite/ld-mips-elf/mips-elf.exp
View File

@ -995,6 +995,7 @@ if { $linux_gnu } {
}
run_dump_test "undefined"
run_dump_test "undefined-warn"
# Test the conversion from jr to b
if { $linux_gnu } {

13
ld/testsuite/ld-mips-elf/undefined-warn.d Normal file
View File

@ -0,0 +1,13 @@
#objdump: -d --prefix-addresses --show-raw-insn
#name: MIPS undefined reference with --warn-unresolved-symbols
#source: undefined.s
#ld: -e foo --warn-unresolved-symbols
#warning: \A[^\n]*\.o: in function `foo':\n\(\.text\+0x0\): warning: undefined reference to `bar'\Z
.*: file format .*
Disassembly of section \.text:
# Loaded value must not be 0.
[0-9a-f]+ <[^>]*> 2402.... li v0,[-1-9][0-9]*
\.\.\.

4
ld/testsuite/ld-mips-elf/undefined.s
View File

@ -22,3 +22,7 @@ foo:
li $2, %got_page(bar)
.end foo
.size foo, . - foo
# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
.align 4, 0
.space 16