From a9d34880555ed60254118c80850a4e4a6f62104f Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Sat, 25 Mar 2006 10:24:27 +0000 Subject: bfd/ * cpu-m68k.c (bfd_m68k_compatible): Treat ISA A+ and ISA B code as incompatible. Likewise MAC and EMAC code. * elf32-m68k.c (elf32_m68k_merge_private_bfd_data): Use bfd_get_compatible to set the new bfd architecture. Rely on it to detect incompatibilities. gas/ * config/tc-m68k.c (m68k_cpus): Change cpu_cf5208 entries to use mcfemac instead of mcfmac. ld/testsuite/ * ld-m68k/merge-error-1a.s, ld-m68k/merge-error-1b.s, * ld-m68k/merge-error-1a.d, ld-m68k/merge-error-1b.d, * ld-m68k/merge-error-1c.d, ld-m68k/merge-error-1d.d, * ld-m68k/merge-error-1e.d, ld-m68k/merge-ok-1a.d, * ld-m68k/merge-ok-1b.d: New tests. * ld-m68k/m68k.exp: Run them. --- ld/testsuite/ChangeLog | 9 +++++++++ ld/testsuite/ld-m68k/m68k.exp | 8 ++++++++ ld/testsuite/ld-m68k/merge-error-1a.d | 4 ++++ ld/testsuite/ld-m68k/merge-error-1a.s | 1 + ld/testsuite/ld-m68k/merge-error-1b.d | 4 ++++ ld/testsuite/ld-m68k/merge-error-1b.s | 1 + ld/testsuite/ld-m68k/merge-error-1c.d | 4 ++++ ld/testsuite/ld-m68k/merge-error-1d.d | 4 ++++ ld/testsuite/ld-m68k/merge-error-1e.d | 4 ++++ ld/testsuite/ld-m68k/merge-ok-1a.d | 6 ++++++ ld/testsuite/ld-m68k/merge-ok-1b.d | 6 ++++++ 11 files changed, 51 insertions(+) create mode 100644 ld/testsuite/ld-m68k/merge-error-1a.d create mode 100644 ld/testsuite/ld-m68k/merge-error-1a.s create mode 100644 ld/testsuite/ld-m68k/merge-error-1b.d create mode 100644 ld/testsuite/ld-m68k/merge-error-1b.s create mode 100644 ld/testsuite/ld-m68k/merge-error-1c.d create mode 100644 ld/testsuite/ld-m68k/merge-error-1d.d create mode 100644 ld/testsuite/ld-m68k/merge-error-1e.d create mode 100644 ld/testsuite/ld-m68k/merge-ok-1a.d create mode 100644 ld/testsuite/ld-m68k/merge-ok-1b.d (limited to 'ld') diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 763c325..4be03b8 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2006-03-25 Richard Sandiford + + * ld-m68k/merge-error-1a.s, ld-m68k/merge-error-1b.s, + * ld-m68k/merge-error-1a.d, ld-m68k/merge-error-1b.d, + * ld-m68k/merge-error-1c.d, ld-m68k/merge-error-1d.d, + * ld-m68k/merge-error-1e.d, ld-m68k/merge-ok-1a.d, + * ld-m68k/merge-ok-1b.d: New tests. + * ld-m68k/m68k.exp: Run them. + 2006-03-22 Richard Sandiford * ld-mips/vxworks1.dd, ld-mips/vxworks1.ld, ld-mips/vxworks1-lib.dd, diff --git a/ld/testsuite/ld-m68k/m68k.exp b/ld/testsuite/ld-m68k/m68k.exp index 5323317..a1096a8 100644 --- a/ld/testsuite/ld-m68k/m68k.exp +++ b/ld/testsuite/ld-m68k/m68k.exp @@ -45,3 +45,11 @@ set m68k_mergeok_tests { {isab.s isab-float.s} {{objdump -p isab-float.d}} "isab-float"}} run_ld_link_tests $m68k_mergeok_tests + +run_dump_test "merge-error-1a" +run_dump_test "merge-error-1b" +run_dump_test "merge-error-1c" +run_dump_test "merge-error-1d" +run_dump_test "merge-error-1e" +run_dump_test "merge-ok-1a" +run_dump_test "merge-ok-1b" diff --git a/ld/testsuite/ld-m68k/merge-error-1a.d b/ld/testsuite/ld-m68k/merge-error-1a.d new file mode 100644 index 0000000..ab3ef6e --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-error-1a.d @@ -0,0 +1,4 @@ +#source: merge-error-1a.s -mcpu=cpu32 +#source: merge-error-1b.s -mcpu=68000 +#ld: -r +#warning: .* diff --git a/ld/testsuite/ld-m68k/merge-error-1a.s b/ld/testsuite/ld-m68k/merge-error-1a.s new file mode 100644 index 0000000..ee48942 --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-error-1a.s @@ -0,0 +1 @@ + rts diff --git a/ld/testsuite/ld-m68k/merge-error-1b.d b/ld/testsuite/ld-m68k/merge-error-1b.d new file mode 100644 index 0000000..291d42f --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-error-1b.d @@ -0,0 +1,4 @@ +#source: merge-error-1a.s -mcpu=cpu32 +#source: merge-error-1b.s -mcpu=5207 +#ld: -r +#warning: .* diff --git a/ld/testsuite/ld-m68k/merge-error-1b.s b/ld/testsuite/ld-m68k/merge-error-1b.s new file mode 100644 index 0000000..ee48942 --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-error-1b.s @@ -0,0 +1 @@ + rts diff --git a/ld/testsuite/ld-m68k/merge-error-1c.d b/ld/testsuite/ld-m68k/merge-error-1c.d new file mode 100644 index 0000000..e745280 --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-error-1c.d @@ -0,0 +1,4 @@ +#source: merge-error-1a.s -march=isaaplus +#source: merge-error-1b.s -march=isab +#ld: -r +#warning: .* diff --git a/ld/testsuite/ld-m68k/merge-error-1d.d b/ld/testsuite/ld-m68k/merge-error-1d.d new file mode 100644 index 0000000..310bf43 --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-error-1d.d @@ -0,0 +1,4 @@ +#source: merge-error-1a.s -march=isaa -mmac +#source: merge-error-1b.s -march=isaa -memac +#ld: -r +#warning: .* diff --git a/ld/testsuite/ld-m68k/merge-error-1e.d b/ld/testsuite/ld-m68k/merge-error-1e.d new file mode 100644 index 0000000..87a2bf9 --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-error-1e.d @@ -0,0 +1,4 @@ +#source: merge-error-1a.s -march=isaa -mno-div -mmac +#source: merge-error-1b.s -march=isaa -mno-div -memac +#ld: -r +#warning: .* diff --git a/ld/testsuite/ld-m68k/merge-ok-1a.d b/ld/testsuite/ld-m68k/merge-ok-1a.d new file mode 100644 index 0000000..96da556 --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-ok-1a.d @@ -0,0 +1,6 @@ +#source: merge-error-1a.s -mcpu=5207 +#source: merge-error-1b.s -mcpu=528x +#ld: -r +#objdump: -p +#... +private flags = 23: \[isa A\+\] \[emac\] diff --git a/ld/testsuite/ld-m68k/merge-ok-1b.d b/ld/testsuite/ld-m68k/merge-ok-1b.d new file mode 100644 index 0000000..03ae258 --- /dev/null +++ b/ld/testsuite/ld-m68k/merge-ok-1b.d @@ -0,0 +1,6 @@ +#source: merge-error-1a.s -march=isaa -mno-div -mmac +#source: merge-error-1b.s -march=isaa -mno-div -mfloat +#ld: -r +#objdump: -p +#... +private flags = 8051: \[cfv4e\] \[isa A\] \[nodiv\] \[float\] \[mac\] -- cgit v1.1