OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bfd/ 

2006-07-12  Matthew R. Dempsky  <mrd@alkemio.org>

	* cpu-m68k.c (bfd_m68k_compatible): Handle CPU32.

ld/testsuite/
2006-07-12  Richard Sandiford  <richard@codesourcery.com>

	* ld-m68k/merge-ok-1c.d: New test.
	* ld-m68k/m68k.exp: Run it.
This commit is contained in:
Richard Sandiford 2006-07-12 12:47:00 +00:00
parent 7cfe9437c6
commit fb405f8a9f
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfd/ChangeLog
View File

@ -1,3 +1,7 @@
2006-07-12 Matthew R. Dempsky <mrd@alkemio.org>
* cpu-m68k.c (bfd_m68k_compatible): Handle CPU32.
2006-07-10 Jakub Jelinek <jakub@redhat.com>
* elf.c (_bfd_elf_print_private_bfd_data): Handle DT_GNU_HASH.

3
bfd/cpu-m68k.c
View File

@ -202,6 +202,9 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
/* Merge m68k machine. */
return a->mach > b->mach ? a : b;
else if (a->mach == bfd_mach_cpu32 && b->mach == bfd_mach_cpu32)
/* CPU32 is compatible with itself. */
return a;
else if (a->mach >= bfd_mach_mcf_isa_a_nodiv
&& b->mach >= bfd_mach_mcf_isa_a_nodiv)
{

5
ld/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2006-07-12 Richard Sandiford <richard@codesourcery.com>
* ld-m68k/merge-ok-1c.d: New test.
* ld-m68k/m68k.exp: Run it.
2006-07-11 Hans-Peter Nilsson <hp@axis.com>
* ld-cris/libdso-2.d: Adjust for recent hash-related changes.

1
ld/testsuite/ld-m68k/m68k.exp
View File

@ -53,6 +53,7 @@ run_dump_test "merge-error-1d"
run_dump_test "merge-error-1e"
run_dump_test "merge-ok-1a"
run_dump_test "merge-ok-1b"
run_dump_test "merge-ok-1c"
foreach { id sources } { a { plt1.s } b { plt1-empty.s plt1.s } } {
foreach arch { 68020 cpu32 isab } {

6
ld/testsuite/ld-m68k/merge-ok-1c.d Normal file
View File

@ -0,0 +1,6 @@
#source: merge-error-1a.s -march=cpu32
#source: merge-error-1b.s -march=cpu32
#ld: -r
#objdump: -p
#...
private flags = 810000: \[cpu32\]