diff options
| -rw-r--r-- | ChangeLog.csl | 21 | ||||
| -rw-r--r-- | bfd/bfd-in.h | 8 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 8 | ||||
| -rw-r--r-- | bfd/cpu-arm.c | 23 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 10 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 3 | ||||
| -rw-r--r-- | ld/testsuite/ld-arm/arm-be8.d | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-arm/arm-be8.s | 14 | ||||
| -rw-r--r-- | ld/testsuite/ld-arm/arm-elf.exp | 3 |
9 files changed, 81 insertions, 17 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index df7052bbed..352d0f6413 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,24 @@ +2006-05-15 Paul Brook <paul@codesourcery.com> + + Backport from mainline. + * bfd/cpu-arm.c (bfd_is_arm_mapping_symbol_name): Rename ... + (bfd_is_arm_special_symbol_name): ... to this. Add type argument. + Check symbol name is of specified type. + * bfd/elf32-arm.c (elf32_arm_is_target_special_symbol, + arm_elf_find_function, elf32_arm_output_symbol_hook): Use + bfd_is_arm_special_symbol_name. + * bfd/bfd-in.h (BFD_ARM_SPECIAL_SYM_TYPE_MAP, + BFD_ARM_SPECIAL_SYM_TYPE_TAG, BFD_ARM_SPECIAL_SYM_TYPE_OTHER, + BFD_ARM_SPECIAL_SYM_TYPE_ANY): Define. + (bfd_is_arm_mapping_symbol_name): Remove prototype. + (bfd_is_arm_special_symbol_name): Add prototype. + * bfd/bfd-in2.h: Regenerate. + * gas/config/tc-arm.c (arm_adjust_symtab): Use + bfd_is_arm_special_symbol_name. + * ld/testsuite/ld-arm/arm-be8.d: New test. + * ld/testsuite/ld-arm/arm-be8.s: New test. + * ld/testsuite/ld-arm/arm-elf.exp: Add arm-be8. + 2006-05-12 Carlos O'Donell <carlos@codesourcery.com> * binutils/doc/binutils.texi: Rename "Index" to "Binutils Index" diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 9daa578c03..730cdca7b5 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -848,8 +848,12 @@ extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd (bfd *, struct bfd_link_info *); /* ELF ARM mapping symbol support */ -extern bfd_boolean bfd_is_arm_mapping_symbol_name - (const char * name); +#define BFD_ARM_SPECIAL_SYM_TYPE_MAP (1 << 0) +#define BFD_ARM_SPECIAL_SYM_TYPE_TAG (1 << 1) +#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER (1 << 2) +#define BFD_ARM_SPECIAL_SYM_TYPE_ANY (~0) +extern bfd_boolean bfd_is_arm_special_symbol_name + (const char * name, int type); /* ARM Note section processing. */ extern bfd_boolean bfd_arm_merge_machines diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index de564e2038..0e90052ad4 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -855,8 +855,12 @@ extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd (bfd *, struct bfd_link_info *); /* ELF ARM mapping symbol support */ -extern bfd_boolean bfd_is_arm_mapping_symbol_name - (const char * name); +#define BFD_ARM_SPECIAL_SYM_TYPE_MAP (1 << 0) +#define BFD_ARM_SPECIAL_SYM_TYPE_TAG (1 << 1) +#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER (1 << 2) +#define BFD_ARM_SPECIAL_SYM_TYPE_ANY (~0) +extern bfd_boolean bfd_is_arm_special_symbol_name + (const char * name, int type); /* ARM Note section processing. */ extern bfd_boolean bfd_arm_merge_machines diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c index a28a1f9e8f..f92d83bd61 100644 --- a/bfd/cpu-arm.c +++ b/bfd/cpu-arm.c @@ -402,14 +402,21 @@ bfd_arm_get_mach_from_notes (bfd *abfd, const char *note_section) } bfd_boolean -bfd_is_arm_mapping_symbol_name (const char * name) +bfd_is_arm_special_symbol_name (const char * name, int type) { /* The ARM compiler outputs several obsolete forms. Recognize them - in addition to the standard $a, $t and $d. */ - return (name != NULL) - && (name[0] == '$') - && ((name[1] == 'a') || (name[1] == 't') || (name[1] == 'd') - || (name[1] == 'm') || (name[1] == 'f') || (name[1] == 'p')) - && (name[2] == 0 || name[2] == '.'); -} + in addition to the standard $a, $t and $d. We are somewhat loose + in what we accept here, since the full set is not documented. */ + if (!name || name[0] != '$') + return FALSE; + if (name[1] == 'a' || name[1] == 't' || name[1] == 'd') + type &= BFD_ARM_SPECIAL_SYM_TYPE_MAP; + else if (name[1] == 'm' || name[1] == 'f' || name[1] == 'p') + type &= BFD_ARM_SPECIAL_SYM_TYPE_TAG; + else if (name[1] >= 'a' && name[1] <= 'z') + type &= BFD_ARM_SPECIAL_SYM_TYPE_OTHER; + else + return FALSE; + return (type != 0 && (name[2] == 0 || name[2] == '.')); +} diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index b350001786..18dc0fb3f4 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -6110,7 +6110,8 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info, static bfd_boolean elf32_arm_is_target_special_symbol (bfd * abfd ATTRIBUTE_UNUSED, asymbol * sym) { - return bfd_is_arm_mapping_symbol_name (sym->name); + return bfd_is_arm_special_symbol_name (sym->name, + BFD_ARM_SPECIAL_SYM_TYPE_ANY); } /* This is a copy of elf_find_function() from elf.c except that @@ -6146,9 +6147,10 @@ arm_elf_find_function (bfd * abfd ATTRIBUTE_UNUSED, case STT_FUNC: case STT_ARM_TFUNC: case STT_NOTYPE: - /* Skip $a and $t symbols. */ + /* Skip mapping symbols. */ if ((q->symbol.flags & BSF_LOCAL) - && bfd_is_arm_mapping_symbol_name (q->symbol.name)) + && bfd_is_arm_special_symbol_name (q->symbol.name, + BFD_ARM_SPECIAL_SYM_TYPE_ANY)) continue; /* Fall through. */ if (bfd_get_section (&q->symbol) == section @@ -7879,7 +7881,7 @@ elf32_arm_output_symbol_hook (struct bfd_link_info *info, return TRUE; /* We only want mapping symbols. */ - if (! bfd_is_arm_mapping_symbol_name (name)) + if (!bfd_is_arm_special_symbol_name (name, BFD_ARM_SPECIAL_SYM_TYPE_MAP)) return TRUE; /* If this section has not been allocated an _arm_elf_section_data diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index ca8fb612e2..0775c27afd 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -18268,7 +18268,8 @@ arm_adjust_symtab (void) elf_sym = elf_symbol (symbol_get_bfdsym (sym)); bind = ELF_ST_BIND (elf_sym->internal_elf_sym.st_info); - if (! bfd_is_arm_mapping_symbol_name (elf_sym->symbol.name)) + if (! bfd_is_arm_special_symbol_name (elf_sym->symbol.name, + BFD_ARM_SPECIAL_SYM_TYPE_ANY)) { /* If it's a .thumb_func, declare it as so, otherwise tag label as .code 16. */ diff --git a/ld/testsuite/ld-arm/arm-be8.d b/ld/testsuite/ld-arm/arm-be8.d new file mode 100644 index 0000000000..43ce9b016e --- /dev/null +++ b/ld/testsuite/ld-arm/arm-be8.d @@ -0,0 +1,8 @@ + +.*: file format.* + +Contents of section .text: + 8000 0000a0e3 1eff2fe1 c0467047 fff7fcff .* + 8010 12345678 .* +# Ignore .ARM.attributes section +#... diff --git a/ld/testsuite/ld-arm/arm-be8.s b/ld/testsuite/ld-arm/arm-be8.s new file mode 100644 index 0000000000..871b691153 --- /dev/null +++ b/ld/testsuite/ld-arm/arm-be8.s @@ -0,0 +1,14 @@ +.arch armv6 +.text +arm: +mov r0, #0 +$m: +bx lr +.thumb +.thumb_func +thumb: +nop +bx lr +bl thumb +data: +.word 0x12345678 diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp index 04aa09cf49..eedbe10106 100644 --- a/ld/testsuite/ld-arm/arm-elf.exp +++ b/ld/testsuite/ld-arm/arm-elf.exp @@ -125,6 +125,9 @@ set armelftests { {"MOVW/MOVT" "-static -T arm.ld" "" {arm-movwt.s} {{objdump -dw arm-movwt.d}} "arm-movwt"} + {"BE8 Mapping Symbols" "-static -T arm.ld -EB --be8" "-EB" {arm-be8.s} + {{objdump -s arm-be8.d}} + "arm-be8"} } run_ld_link_tests $armelftests |