mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-04 07:44:22 +08:00
660df28acf
Changing objdump disassembly output like this always requires some testsuite changes, with the avr and x64_64 changes simply due to picking up better symbols, the whole point of the patch. The mips changes are due to mips-sgi-irix changing STT_NOTYPE symbols to STT_OBJECT, which objdump now chooses in preference to script symbols. The problem is that objdump looks at the first symbol in the section being disassembled, and if object type, just dumps out bytes rather than disassembling. This results in new failures: FAIL: JAL overflow 2 FAIL: undefined weak symbol overflow FAIL: undefined weak symbol overflow (n32) FAIL: undefined weak symbol overflow (n64) So for mips-sgi-irix function symbols really do need to be function type. I fixed a few more than just the required minimum to avoid the above test fails. binutils/ * objdump.c (compare_section): New static var. (compare_symbols): Sort by current section only. Don't access symbol name out of bounds when checking for file symbols. Sort section symbols and object symbols. (find_symbol_for_address): Remove bogus debugging and section symbol test. (disassemble_data): Move symbol sort from here.. (disassemble_section): ..to here. Set compare_section. ld/ * testsuite/ld-avr/lds-mega.d: Adjust symbols to suit objdump change. * testsuite/ld-avr/lds-tiny.d: Likewise. * testsuite/ld-x86-64/load2.d: Likewise. * testsuite/ld-mips-elf/compact-eh1.s: Give function symbols function type. * testsuite/ld-mips-elf/compact-eh1a.s: Likewise. * testsuite/ld-mips-elf/compact-eh1b.s: Likewise. * testsuite/ld-mips-elf/compact-eh2.s: Likewise. * testsuite/ld-mips-elf/compact-eh3.s: Likewise. * testsuite/ld-mips-elf/compact-eh3a.s: Likewise. * testsuite/ld-mips-elf/eh-frame5.s: Likewise. * testsuite/ld-mips-elf/ehdr_start-new.s: Likewise. * testsuite/ld-mips-elf/ehdr_start-o32.s: Likewise. * testsuite/ld-mips-elf/emit-relocs-1a.s: Likewise. * testsuite/ld-mips-elf/jaloverflow-2.s: Likewise. * testsuite/ld-mips-elf/jaloverflow.s: Likewise. * testsuite/ld-mips-elf/mips16-call-global-1.s: Likewise. * testsuite/ld-mips-elf/mips16-intermix-1.s: Likewise. * testsuite/ld-mips-elf/mips16-pic-1b.s: Likewise. * testsuite/ld-mips-elf/mips16-pic-4c.s: Likewise. * testsuite/ld-mips-elf/no-shared-1-n64.s: Likewise. * testsuite/ld-mips-elf/no-shared-1-o32.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-1b-micromips.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-1b.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-2a.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-3b.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-4b.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-5a.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s: Likewise. * testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s: Likewise. * testsuite/ld-mips-elf/pie.s: Likewise. * testsuite/ld-mips-elf/relax-jalr.s: Likewise. * testsuite/ld-mips-elf/reloc-1a.s: Likewise. * testsuite/ld-mips-elf/reloc-2a.s: Likewise. * testsuite/ld-mips-elf/reloc-4.s: Likewise. * testsuite/ld-mips-elf/reloc-5.s: Likewise. * testsuite/ld-mips-elf/reloc-6b.s: Likewise. * testsuite/ld-mips-elf/textrel-1.s: Likewise. * testsuite/ld-mips-elf/undefweak-overflow.s: Likewise. * testsuite/ld-mips-elf/undefweak-overflow.d: Adjust.
41 lines
1.2 KiB
Makefile
41 lines
1.2 KiB
Makefile
#name: undefined weak symbol overflow
|
|
#source: undefweak-overflow.s
|
|
#ld: -Ttext=0x20000000 -e start
|
|
#objdump: -dr --show-raw-insn
|
|
#...
|
|
[0-9a-f]+ <start>:
|
|
[ 0-9a-f]+: d85fffff beqzc v0,20000000 <start>
|
|
[ 0-9a-f]+: 00000000 nop
|
|
[ 0-9a-f]+: f85ffffd bnezc v0,20000000 <start>
|
|
[ 0-9a-f]+: ec4ffffd lwpc v0,20000000 <start>
|
|
[ 0-9a-f]+: ec5bfffe ldpc v0,20000000 <start>
|
|
[ 0-9a-f]+: cbfffffa bc 20000000 <start>
|
|
[ 0-9a-f]+: 1000fff9 b 20000000 <start>
|
|
[ 0-9a-f]+: 00000000 nop
|
|
[ 0-9a-f]+: 0411fff7 bal 20000000 <start>
|
|
[ 0-9a-f]+: 3c...... lui a0,0x....
|
|
[ 0-9a-f]+: 0c000000 jal 20000000 <start>
|
|
[ 0-9a-f]+: 00000000 nop
|
|
[ 0-9a-f]+: 08000000 j 20000000 <start>
|
|
[ 0-9a-f]+: 00000000 nop
|
|
|
|
[0-9a-f]+ <micro>:
|
|
[ 0-9a-f]+: 8e63 beqz a0,20000000 <start>
|
|
[ 0-9a-f]+: 0c00 nop
|
|
[ 0-9a-f]+: cfe1 b 20000000 <start>
|
|
[ 0-9a-f]+: 0c00 nop
|
|
[ 0-9a-f]+: 9400 ffde b 20000000 <start>
|
|
[ 0-9a-f]+: 0c00 nop
|
|
[ 0-9a-f]+: 4060 ffdb bal 20000000 <start>
|
|
[ 0-9a-f]+: 0000 0000 nop
|
|
[ 0-9a-f]+: f400 0000 jal 20000000 <start>
|
|
[ 0-9a-f]+: 0000 0000 nop
|
|
[ 0-9a-f]+: d400 0000 j 20000000 <start>
|
|
[ 0-9a-f]+: 0c00 nop
|
|
|
|
[0-9a-f]+ <mips16>:
|
|
[ 0-9a-f]+: f7df 1010 b 20000000 <start>
|
|
[ 0-9a-f]+: 1800 0000 jal 20000000 <start>
|
|
[ 0-9a-f]+: 6500 nop
|
|
#pass
|