From 3bdf9505dbaec2f32d25b4c1bb65c61d414be608 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 3 Aug 2012 22:14:21 +0000 Subject: [PATCH] bfd/ * elfxx-mips.c (mips_elf_perform_relocation): Update the cross-mode jump message. ld/testsuite/ * ld-mips-elf/mode-change-error-1.d: Update the error message. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-mips.c | 5 +++-- ld/testsuite/ChangeLog | 4 ++++ ld/testsuite/ld-mips-elf/mode-change-error-1.d | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0fcfdb1ad41..9eb776ea5d2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2012-08-03 Maciej W. Rozycki + + * elfxx-mips.c (mips_elf_perform_relocation): Update the + cross-mode jump message. + 2012-08-03 Maciej W. Rozycki * elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Update the diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index cf1baa865e4..82743acdd6d 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -5930,11 +5930,12 @@ mips_elf_perform_relocation (struct bfd_link_info *info, jalx_opcode = 0x1d; } - /* If the opcode is not JAL or JALX, there's a problem. */ + /* If the opcode is not JAL or JALX, there's a problem. We cannot + convert J or JALS to JALX. */ if (!ok) { (*_bfd_error_handler) - (_("%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled."), + (_("%B: %A+0x%lx: Unsupported jump between ISA modes; consider recompiling with interlinking enabled."), input_bfd, input_section, (unsigned long) relocation->r_offset); diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 685863a98f2..3811b14eb23 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-08-03 Maciej W. Rozycki + + * ld-mips-elf/mode-change-error-1.d: Update the error message. + 2012-08-02 Maciej W. Rozycki * ld-mips-elf/got-vers-1.rd: Fix a typo. diff --git a/ld/testsuite/ld-mips-elf/mode-change-error-1.d b/ld/testsuite/ld-mips-elf/mode-change-error-1.d index 55e9027b783..885c62809dc 100644 --- a/ld/testsuite/ld-mips-elf/mode-change-error-1.d +++ b/ld/testsuite/ld-mips-elf/mode-change-error-1.d @@ -2,4 +2,4 @@ #source: mode-change-error-1a.s #source: mode-change-error-1b.s #ld: -e 0x8000000 -#error: .*: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled. +#error: .*: Unsupported jump between ISA modes; consider recompiling with interlinking enabled. -- 2.30.2