MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ld: Fix several 32-bit SPARC plugin tests

Browse Source 
Several ld plugin tests currently FAIL on 32-bit Solaris/SPARC:

FAIL: load plugin with source
FAIL: plugin claimfile lost symbol with source
FAIL: plugin claimfile replace symbol with source
FAIL: plugin claimfile resolve symbol with source
FAIL: plugin claimfile replace file with source
FAIL: plugin set symbol visibility with source
FAIL: plugin ignore lib with source
FAIL: plugin claimfile replace lib with source
FAIL: plugin 2 with source lib
FAIL: load plugin 2 with source
FAIL: load plugin 2 with source and -r
FAIL: plugin 3 with source lib
FAIL: load plugin 3 with source
FAIL: load plugin 3 with source and -r
FAIL: PR ld/20070

all of them in the same way:

./ld-new: BFD (GNU Binutils) 2.34.50.20200328 internal error, aborting at /vol/src/gnu/binutils/hg/master/git/bfd/elf32-sparc.c:154 in sparc_final_write_processing

This happens when bfd_get_mach returns 0 when abfd refers to a source
file:

$11 = {
  filename = 0x28c358 "/vol/src/gnu/binutils/hg/master/local/ld/testsuite/ld-plugin/func.c (symbol from plugin)", xvec = 0x24ed6c <sparc_elf32_sol2_vec>,
[...]

While I could find no specification what abfd's are allowed/expected in
*_final_write_processing, I could find no other target that behaved the
same.  And indeed ignoring the 0 case fixes the failures.  The code now
errors for other values.  64-bit SPARC is not affected because it doesn't
have a specific implementation of elf_backend_final_write_processing.

Tested on sparc-sun-solaris2.11.

2020-04-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
	    Nick Clifton  <nickc@redhat.com>

	* elf32-sparc.c (sparc_final_write_processing): Fix whitespace.
	<0>: Ignore.
	<default>: Error rather than abort.
This commit is contained in:
Rainer Orth 2020-04-07 16:52:03 +02:00
parent 6e0e8b4502
commit 3e97ba7d58
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bfd/elf32-sparc.c
View File

@ -121,37 +121,41 @@ sparc_final_write_processing (bfd *abfd)
{ {
switch (bfd_get_mach (abfd)) switch (bfd_get_mach (abfd))
{ {
case bfd_mach_sparc : case bfd_mach_sparc:
case bfd_mach_sparc_sparclet : case bfd_mach_sparc_sparclet:
case bfd_mach_sparc_sparclite : case bfd_mach_sparc_sparclite:
break; /* nothing to do */ break; /* nothing to do */
case bfd_mach_sparc_v8plus : case bfd_mach_sparc_v8plus:
elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS; elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS;
elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK; elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK;
elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS; elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS;
break; break;
case bfd_mach_sparc_v8plusa : case bfd_mach_sparc_v8plusa:
elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS; elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS;
elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK; elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK;
elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1; elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1;
break; break;
case bfd_mach_sparc_v8plusb : case bfd_mach_sparc_v8plusb:
case bfd_mach_sparc_v8plusc : case bfd_mach_sparc_v8plusc:
case bfd_mach_sparc_v8plusd : case bfd_mach_sparc_v8plusd:
case bfd_mach_sparc_v8pluse : case bfd_mach_sparc_v8pluse:
case bfd_mach_sparc_v8plusv : case bfd_mach_sparc_v8plusv:
case bfd_mach_sparc_v8plusm : case bfd_mach_sparc_v8plusm:
case bfd_mach_sparc_v8plusm8 : case bfd_mach_sparc_v8plusm8:
elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS; elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS;
elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK; elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK;
elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1 elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1
| EF_SPARC_SUN_US3; | EF_SPARC_SUN_US3;
break; break;
case bfd_mach_sparc_sparclite_le : case bfd_mach_sparc_sparclite_le:
elf_elfheader (abfd)->e_flags |= EF_SPARC_LEDATA; elf_elfheader (abfd)->e_flags |= EF_SPARC_LEDATA;
break; break;
default : case 0: /* A non-sparc architecture - ignore. */
abort (); break;
default:
_bfd_error_handler
(_("%pB: unhandled sparc machine value '%lu' detected during write processing"),
abfd, (long) bfd_get_mach (abfd));
break; break;
} }
} }