diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2010-10-29 16:47:51 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2010-10-29 16:47:51 +0000 |
| commit | d4e895e4765c8fcb67df9cbb0a31ff0fdd3c2882 (patch) | |
| tree | e736ec76e84738858909c14d8e5d535d2c6c66dc /bfd/elf32-tic6x.c | |
| parent | 0eef930edd6562c8658bb4f369780acc9c12f1a2 (diff) | |
| download | binutils-redhat-d4e895e4765c8fcb67df9cbb0a31ff0fdd3c2882.tar.gz | |
bfd:
* elf32-tic6x.c (elf32_tic6x_obj_attrs_arg_type): Check
Tag_ABI_compatibility not Tag_compatibility.
(elf32_tic6x_merge_attributes): Update compatibility attribute
name in comment. Return FALSE if merging common attributes fails.
binutils:
* readelf.c (display_tic6x_attribute): Use Tag_ABI_compatibility
not hardcoded 32. Display name of this attribute.
gas:
* doc/c-tic6x.texi (TIC6X Directives): Mention
Tag_ABI_compatibility.
gas/testsuite:
* gas/tic6x/attr-compatibility-directive-1.d,
gas/tic6x/attr-compatibility-directive-1.s,
gas/tic6x/attr-compatibility-directive-2.d,
gas/tic6x/attr-compatibility-directive-2.s: New tests.
include/elf:
* tic6x-attrs.h (Tag_ABI_compatibility): Define.
ld/testsuite:
* ld-tic6x/attr-compatibility-gnu-gnu.d,
ld-tic6x/attr-compatibility-gnu-other.d,
ld-tic6x/attr-compatibility-gnu.s,
ld-tic6x/attr-compatibility-other-gnu.d,
ld-tic6x/attr-compatibility-other-other.d,
ld-tic6x/attr-compatibility-other.s: New tests.
Diffstat (limited to 'bfd/elf32-tic6x.c')
| -rw-r--r-- | bfd/elf32-tic6x.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c index 219e73dd5a..3e8564a433 100644 --- a/bfd/elf32-tic6x.c +++ b/bfd/elf32-tic6x.c @@ -1661,7 +1661,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, static int elf32_tic6x_obj_attrs_arg_type (int tag) { - if (tag == Tag_compatibility) + if (tag == Tag_ABI_compatibility) return ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL; else /* Correct for known attributes, arbitrary for others. */ @@ -1729,8 +1729,9 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) (_("warning: %B and %B differ in whether code is compiled for DSBT"), obfd, ibfd); } - /* Merge Tag_compatibility attributes and any common GNU ones. */ - _bfd_elf_merge_object_attributes (ibfd, obfd); + /* Merge Tag_ABI_compatibility attributes and any common GNU ones. */ + if (!_bfd_elf_merge_object_attributes (ibfd, obfd)) + return FALSE; return TRUE; } |