From 88db47c8e4339f5546a3dba8d0c818e728af1093 Mon Sep 17 00:00:00 2001 From: ths Date: Thu, 20 Jul 2006 16:46:29 +0000 Subject: [PATCH] [ bfd/ChangeLog ] * elf32-mips.c (mips16_jump_reloc): Remove function. (elf_mips16_howto_table_rel): Use _bfd_mips_elf_generic_reloc instead of mips16_jump_reloc. * elf64_mips.c, wlfn32-mips.c (mips16_jump_reloc): Remove function. (elf_mips16_howto_table_rel, elf_mips16_howto_table_rela): Use _bfd_mips_elf_generic_reloc instead of mips16_jump_reloc. [ gas/ChangeLog ] * config/tc-mips.c (mips_fix_adjustable): Handle BFD_RELOC_MIPS16_JMP. (tc_gen_reloc): Handle mips16 jumps to section symbol offsets. [ ld/testsuite/ChangeLog ] * ld-mips-elf/mips16-call-global-1.s, ld-mips-elf/mips16-call-global-2.s, ld-mips-elf/mips16-call-global-3.s, ld-mips-elf/mips16-call-global.d: Test linking of external mips16 jumps. * ld-mips-elf/mips-elf.exp: Run new test. --- bfd/ChangeLog | 9 ++++++ bfd/elf32-mips.c | 34 +---------------------- bfd/elf64-mips.c | 37 ++----------------------- bfd/elfn32-mips.c | 28 ++----------------- gas/ChangeLog | 5 ++++ gas/config/tc-mips.c | 9 +++--- ld/testsuite/ChangeLog | 8 ++++++ ld/testsuite/ld-mips-elf/mips-elf.exp | 9 ++++++ ld/testsuite/ld-mips-elf/mips16-call-global-1.s | 12 ++++++++ ld/testsuite/ld-mips-elf/mips16-call-global-2.s | 8 ++++++ ld/testsuite/ld-mips-elf/mips16-call-global-3.s | 6 ++++ ld/testsuite/ld-mips-elf/mips16-call-global.d | 37 +++++++++++++++++++++++++ 12 files changed, 103 insertions(+), 99 deletions(-) create mode 100644 ld/testsuite/ld-mips-elf/mips16-call-global-1.s create mode 100644 ld/testsuite/ld-mips-elf/mips16-call-global-2.s create mode 100644 ld/testsuite/ld-mips-elf/mips16-call-global-3.s create mode 100644 ld/testsuite/ld-mips-elf/mips16-call-global.d diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 55e6b543de..2482506ac6 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2006-07-20 Thiemo Seufer + + * elf32-mips.c (mips16_jump_reloc): Remove function. + (elf_mips16_howto_table_rel): Use _bfd_mips_elf_generic_reloc + instead of mips16_jump_reloc. + * elf64_mips.c, wlfn32-mips.c (mips16_jump_reloc): Remove function. + (elf_mips16_howto_table_rel, elf_mips16_howto_table_rela): Use + _bfd_mips_elf_generic_reloc instead of mips16_jump_reloc. + 2006-07-19 Alan Modra * bfd-in.h (enum notice_asneeded_action): Define. diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index 5745df5b94..e86d95523c 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -68,8 +68,6 @@ static bfd_boolean mips_elf32_object_p (bfd *); static bfd_boolean mips_elf_is_local_label_name (bfd *, const char *); -static bfd_reloc_status_type mips16_jump_reloc - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_reloc_status_type mips16_gprel_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_reloc_status_type mips_elf_final_gp @@ -734,7 +732,7 @@ static reloc_howto_type elf_mips16_howto_table_rel[] = /* This needs complex overflow detection, because the upper four bits must match the PC. */ - mips16_jump_reloc, /* special_function */ + _bfd_mips_elf_generic_reloc, /* special_function */ "R_MIPS16_26", /* name */ TRUE, /* partial_inplace */ 0x3ffffff, /* src_mask */ @@ -1112,36 +1110,6 @@ mips32_64bit_reloc (bfd *abfd, arelent *reloc_entry, return r; } -/* Handle a mips16 jump. */ - -static bfd_reloc_status_type -mips16_jump_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry, - asymbol *symbol, void *data ATTRIBUTE_UNUSED, - asection *input_section, bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && reloc_entry->addend == 0) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - /* FIXME. */ - { - static bfd_boolean warned; - - if (! warned) - (*_bfd_error_handler) - (_("Linking mips16 objects into %s format is not supported"), - bfd_get_target (input_section->output_section->owner)); - warned = TRUE; - } - - return bfd_reloc_undefined; -} - /* Handle a mips16 GP relative reloc. */ static bfd_reloc_status_type diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c index ee5bce6619..aa33cf7d6c 100644 --- a/bfd/elf64-mips.c +++ b/bfd/elf64-mips.c @@ -112,8 +112,6 @@ static bfd_reloc_status_type mips_elf64_gprel32_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_reloc_status_type mips_elf64_shift6_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type mips16_jump_reloc - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_reloc_status_type mips16_gprel_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_boolean mips_elf64_assign_gp @@ -1438,7 +1436,7 @@ static reloc_howto_type mips16_elf64_howto_table_rel[] = /* This needs complex overflow detection, because the upper four bits must match the PC. */ - mips16_jump_reloc, /* special_function */ + _bfd_mips_elf_generic_reloc, /* special_function */ "R_MIPS16_26", /* name */ TRUE, /* partial_inplace */ 0x3ffffff, /* src_mask */ @@ -1510,7 +1508,7 @@ static reloc_howto_type mips16_elf64_howto_table_rela[] = /* This needs complex overflow detection, because the upper four bits must match the PC. */ - mips16_jump_reloc, /* special_function */ + _bfd_mips_elf_generic_reloc, /* special_function */ "R_MIPS16_26", /* name */ FALSE, /* partial_inplace */ 0x3ffffff, /* src_mask */ @@ -2044,37 +2042,6 @@ mips_elf64_shift6_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol, error_message); } -/* Handle a mips16 jump. */ - -static bfd_reloc_status_type -mips16_jump_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry, - asymbol *symbol, void *data ATTRIBUTE_UNUSED, - asection *input_section, bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (! reloc_entry->howto->partial_inplace - || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - /* FIXME. */ - { - static bfd_boolean warned; - - if (! warned) - (*_bfd_error_handler) - (_("Linking mips16 objects into %s format is not supported"), - bfd_get_target (input_section->output_section->owner)); - warned = TRUE; - } - - return bfd_reloc_undefined; -} - /* Handle a mips16 GP relative reloc. */ static bfd_reloc_status_type diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c index 367bcf33ff..275e83cdc1 100644 --- a/bfd/elfn32-mips.c +++ b/bfd/elfn32-mips.c @@ -61,8 +61,6 @@ static bfd_reloc_status_type gprel32_with_gp (bfd *, asymbol *, arelent *, asection *, bfd_boolean, void *, bfd_vma); static bfd_reloc_status_type mips_elf_shift6_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type mips16_jump_reloc - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_reloc_status_type mips16_gprel_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup @@ -1444,7 +1442,7 @@ static reloc_howto_type elf_mips16_howto_table_rel[] = /* This needs complex overflow detection, because the upper four bits must match the PC. */ - mips16_jump_reloc, /* special_function */ + _bfd_mips_elf_generic_reloc, /* special_function */ "R_MIPS16_26", /* name */ TRUE, /* partial_inplace */ 0x3ffffff, /* src_mask */ @@ -1516,7 +1514,7 @@ static reloc_howto_type elf_mips16_howto_table_rela[] = /* This needs complex overflow detection, because the upper four bits must match the PC. */ - mips16_jump_reloc, /* special_function */ + _bfd_mips_elf_generic_reloc, /* special_function */ "R_MIPS16_26", /* name */ FALSE, /* partial_inplace */ 0x3ffffff, /* src_mask */ @@ -1901,28 +1899,6 @@ mips_elf_shift6_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol, error_message); } -/* Handle a mips16 jump. */ - -static bfd_reloc_status_type -mips16_jump_reloc (bfd *abfd ATTRIBUTE_UNUSED, - arelent *reloc_entry ATTRIBUTE_UNUSED, - asymbol *symbol ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED, - asection *input_section, bfd *output_bfd ATTRIBUTE_UNUSED, - char **error_message ATTRIBUTE_UNUSED) -{ - static bfd_boolean warned = FALSE; - - /* FIXME. */ - if (! warned) - (*_bfd_error_handler) - (_("Linking mips16 objects into %s format is not supported"), - bfd_get_target (input_section->output_section->owner)); - warned = TRUE; - - return bfd_reloc_undefined; -} - /* Handle a mips16 GP relative reloc. */ static bfd_reloc_status_type diff --git a/gas/ChangeLog b/gas/ChangeLog index 999b795b2d..dcb7a3342b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2006-07-20 Thiemo Seufer + + * config/tc-mips.c (mips_fix_adjustable): Handle BFD_RELOC_MIPS16_JMP. + (tc_gen_reloc): Handle mips16 jumps to section symbol offsets. + 2006-07-19 Paul Brook * config/tc-arm.c (insns): Fix rbit Arm opcode. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index abe4630a14..788a34b5ba 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -13498,11 +13498,6 @@ md_estimate_size_before_relax (fragS *fragp, asection *segtype) int mips_fix_adjustable (fixS *fixp) { - /* Don't adjust MIPS16 jump relocations, so we don't have to worry - about the format of the offset in the .o file. */ - if (fixp->fx_r_type == BFD_RELOC_MIPS16_JMP) - return 0; - if (fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT || fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY) return 0; @@ -13578,6 +13573,10 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp) else reloc->addend = fixp->fx_addnumber; + /* Handle relocs adjusted against a section symbol. */ + if (fixp->fx_r_type == BFD_RELOC_MIPS16_JMP) + reloc->addend += fixp->fx_offset; + /* Since the old MIPS ELF ABI uses Rel instead of Rela, encode the vtable entry to be used in the relocation's section offset. */ if (! HAVE_NEWABI && fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index ad6b44c577..395ae65c37 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2006-07-20 Thiemo Seufer + + * ld-mips-elf/mips16-call-global-1.s, + ld-mips-elf/mips16-call-global-2.s, + ld-mips-elf/mips16-call-global-3.s, ld-mips-elf/mips16-call-global.d: + Test linking of external mips16 jumps. + * ld-mips-elf/mips-elf.exp: Run new test. + 2006-07-19 Thiemo Seufer * ld-selective/selective.exp: Fix selective testcases for MIPS. diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp index b5ddaefd58..aba416f56a 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf.exp @@ -243,3 +243,12 @@ if {[istarget mips*-*-linux*]} { run_ld_link_tests $mips_tls_tests } +set mips16_call_global_test { + {"Global calls from mips16" + "" + "-mips32r2" {mips16-call-global-1.s mips16-call-global-2.s mips16-call-global-3.s} + {{objdump -dr mips16-call-global.d}} + "mips16-call-global"} +} + +run_ld_link_tests $mips16_call_global_test diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global-1.s b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s new file mode 100644 index 0000000000..1e60bcc14c --- /dev/null +++ b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s @@ -0,0 +1,12 @@ + .set mips16 + + .globl __start + .ent __start +__start: + .frame $sp,24,$31 + save 24,$31 + jal x+8 + jal y+8 + restore 24,$31 + j $31 + .end __start diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global-2.s b/ld/testsuite/ld-mips-elf/mips16-call-global-2.s new file mode 100644 index 0000000000..bae3195799 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/mips16-call-global-2.s @@ -0,0 +1,8 @@ + .set mips16 + + .globl x + .ent x + .type x,@function +x: + jr $31 + .end x diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global-3.s b/ld/testsuite/ld-mips-elf/mips16-call-global-3.s new file mode 100644 index 0000000000..e776b3d548 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/mips16-call-global-3.s @@ -0,0 +1,6 @@ + .globl y + .ent y + .type y,@function +y: + jr $31 + .end y diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global.d b/ld/testsuite/ld-mips-elf/mips16-call-global.d new file mode 100644 index 0000000000..bd5095e66d --- /dev/null +++ b/ld/testsuite/ld-mips-elf/mips16-call-global.d @@ -0,0 +1,37 @@ +#as: -mips32r2 +#source: mips16-call-global-1.S mips16-call-global-2.S mips16-call-global-3.S + +.*: file format elf.*mips + +Disassembly of section .text: + +00400090 <__start>: + 400090: 64c3 save 24,ra + 400092: 1a00 002e jal 4000b8 + 400096: 6500 nop + 400098: 1e00 0032 jalx 4000c8 + 40009c: 6500 nop + 40009e: 6443 restore 24,ra + 4000a0: e8a0 jrc ra + 4000a2: 6500 nop + 4000a4: 6500 nop + 4000a6: 6500 nop + 4000a8: 6500 nop + 4000aa: 6500 nop + 4000ac: 6500 nop + 4000ae: 6500 nop + +004000b0 : + 4000b0: e8a0 jrc ra + 4000b2: 6500 nop + 4000b4: 6500 nop + 4000b6: 6500 nop + 4000b8: 6500 nop + 4000ba: 6500 nop + 4000bc: 6500 nop + 4000be: 6500 nop + +004000c0 : + 4000c0: 03e00008 jr ra + 4000c4: 00000000 nop + \.\.\. -- 2.11.0