diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/ldmain.c | 3 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-mips-elf/mips-elf-flags.exp | 3 |
4 files changed, 14 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 496d3de..961ce66 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2003-09-30 Chris Demetriou <cgd@broadcom.com> + + * ldmain.c (get_emulation): Ignore "-mips64r2". + 2003-09-03 Robert Millan <robertmh@gnu.org> * configure.host: Match GNU/KFreeBSD with new kfreebsd*-gnu diff --git a/ld/ldmain.c b/ld/ldmain.c index fb07a81..b18b580 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -602,7 +602,8 @@ get_emulation (int argc, char **argv) || strcmp (argv[i], "-mips5") == 0 || strcmp (argv[i], "-mips32") == 0 || strcmp (argv[i], "-mips32r2") == 0 - || strcmp (argv[i], "-mips64") == 0) + || strcmp (argv[i], "-mips64") == 0 + || strcmp (argv[i], "-mips64r2") == 0) { /* FIXME: The arguments -mips1, -mips2, -mips3, etc. are passed to the linker by some MIPS compilers. They diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 900402c..643db87 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-09-30 Chris Demetriou <cgd@broadcom.com> + + * ld-mips-elf/mips-elf-flags.exp: Add tests for combinations + with MIPS64r2. + 2003-09-29 H.J. Lu <hongjiu.lu@intel.com> * lib/ld-lib.exp (proc is_elf64): New. diff --git a/ld/testsuite/ld-mips-elf/mips-elf-flags.exp b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp index b289a6d..73dd24e 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf-flags.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp @@ -133,6 +133,7 @@ isa_conflict { "-march=r3900 -32" "-march=r6000 -32" } 3900 6000 isa_conflict { "-march=r4010 -32" "-march=r4650 -32" } 4010 4650 isa_conflict { "-mips3 -mgp32 -32" "-mips32 -32" } 4000 isa32 isa_conflict { "-march=sb1 -mgp32 -32" "-mips32r2 -32" } sb1 isa32r2 +isa_conflict { "-march=sb1 -32" "-mips64r2 -32" } sb1 isa64r2 regsize_conflict { "-mips4 -mgp64 -mabi=o64" "-mips2 -32" } regsize_conflict { "-mips4 -mabi=o64" "-mips4 -mabi=32" } @@ -140,6 +141,7 @@ regsize_conflict { "-mips4 -mabi=eabi -mgp32" "-mips4 -mabi=eabi -mgp64" } regsize_conflict { "-march=vr5000 -mgp64 -mabi=o64" "-march=vr5000 -mgp32 -32" } regsize_conflict { "-mips32 -32" "-mips64 -mabi=o64" } regsize_conflict { "-mips32r2 -32" "-mips64 -mabi=o64" } +regsize_conflict { "-mips32r2 -32" "-mips64r2 -mabi=o64" } good_combination { "-mips4 -mgp32 -32" "-mips2 -32" } { mips4 o32 } good_combination { "-mips4 -mabi=32" "-mips2 -32" } { mips4 o32 } @@ -152,6 +154,7 @@ good_combination { "-march=vr4100 -32" "-march=vr4120 -32" } { 4120 } good_combination { "-march=vr5400 -32" "-march=vr5500 -32" "-mips4 -32" } { 5500 } good_combination { "-mips3 -32" "-mips4 -32" "-march=sb1 -32" "-mips5 -32" } { sb1 } good_combination { "-mips1 -32" "-march=3900 -32" } { 3900 } +good_combination { "-mips3 -32" "-mips64r2 -32" "-mips64 -32" } { mips64r2 } good_combination { "-march=vr4120 -mabi=32" "-mips3 -mabi=32" } { 4120 o32 } good_combination { "-march=sb1 -mgp32 -32" "-march=4000 -mgp32 -32" } { sb1 o32 } |