diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-tic6x.c | 6 | ||||
| -rw-r--r-- | include/elf/ChangeLog | 5 | ||||
| -rw-r--r-- | include/elf/tic6x-attrs.h | 1 |
4 files changed, 18 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8fbaed21fa2..a45bac7cf70 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2010-10-29 Bernd Schmidt <bernds@codesourcery.com> + Joseph Myers <joseph@codesourcery.com> + + * elf32-tic6x.c (elf32_tic6x_merge_attributes): Check for mismatch + of DSBT attributes. + 2010-10-25 Daniel Jacobowitz <dan@codesourcery.com> * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Always call diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c index 3d76648836c..219e73dd5a6 100644 --- a/bfd/elf32-tic6x.c +++ b/bfd/elf32-tic6x.c @@ -1723,6 +1723,12 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) = elf32_tic6x_merge_arch_attributes (in_attr[Tag_ISA].i, out_attr[Tag_ISA].i); + if (out_attr[Tag_ABI_DSBT].i != in_attr[Tag_ABI_DSBT].i) + { + _bfd_error_handler + (_("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); diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 9738df7ce37..a8e25fd5a23 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,8 @@ +2010-10-29 Bernd Schmidt <bernds@codesourcery.com> + Joseph Myers <joseph@codesourcery.com> + + * tic6x-attrs.h (Tag_ABI_DSBT): New. + 2010-10-21 Joseph Myers <joseph@codesourcery.com> * tic6x-attrs.h (Tag_C6XABI_Tag_CPU_arch): Change to Tag_ISA, diff --git a/include/elf/tic6x-attrs.h b/include/elf/tic6x-attrs.h index 378350248e8..f131cffd15b 100644 --- a/include/elf/tic6x-attrs.h +++ b/include/elf/tic6x-attrs.h @@ -23,3 +23,4 @@ name and value. */ TAG(Tag_ISA, 4) +TAG(Tag_ABI_DSBT, 12) |