diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2012-08-03 22:14:20 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@linux-mips.org> | 2012-08-03 22:14:20 +0000 |
| commit | 527b5ec319a7a52da30d183888c83fbe05da0292 (patch) | |
| tree | 31040f1f05e84a2378fec61aa214eff7bcfc2546 | |
| parent | 1e3faf7a026b07f211ee6510d8f10e41bab1e522 (diff) | |
| download | binutils-redhat-527b5ec319a7a52da30d183888c83fbe05da0292.tar.gz | |
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.
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfxx-mips.c | 5 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 0fcfdb1ad4..9eb776ea5d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2012-08-03 Maciej W. Rozycki <macro@codesourcery.com> + * elfxx-mips.c (mips_elf_perform_relocation): Update the + cross-mode jump message. + +2012-08-03 Maciej W. Rozycki <macro@codesourcery.com> + * elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Update the comment on DT_MIPS_RLD_MAP. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index cf1baa865e..82743acdd6 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 685863a98f..3811b14eb2 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-08-03 Maciej W. Rozycki <macro@codesourcery.com> + + * ld-mips-elf/mode-change-error-1.d: Update the error message. + 2012-08-02 Maciej W. Rozycki <macro@codesourcery.com> * 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 55e9027b78..885c62809d 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. |