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.

7 files changed, 33 insertions, 1 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index efd7d60..c450019 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* doc/c-tic6x.texi (TIC6X Directives): Mention
+	Tag_ABI_compatibility.
+
 2010-10-29  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* write.c (compress_debug): Optimize section flags check.
diff --git a/gas/doc/c-tic6x.texi b/gas/doc/c-tic6x.texi
index e729cac..cd8be23 100644
--- a/gas/doc/c-tic6x.texi
+++ b/gas/doc/c-tic6x.texi
@@ -125,7 +125,7 @@ These have the same effects as @option{-matomic} and
 Set the C6000 EABI build attribute @var{tag} to @var{value}.
 
 The @var{tag} is either an attribute number or one of
-@code{Tag_ISA} or @code{Tag_ABI_DSBT}.  The
+@code{Tag_ISA}, @code{Tag_ABI_DSBT} and @code{Tag_ABI_compatibility}.  The
 @var{value} is either a @code{number}, @code{"string"}, or
 @code{number, "string"} depending on the tag.
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index cc10178..72e2633 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2010-10-29  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf/dwarf2-1.s: Replace .zdebug_abbrev section with
diff --git a/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.d b/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.d
new file mode 100644
index 0000000..73f6bea
--- /dev/null
+++ b/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.d
@@ -0,0 +1,9 @@
+#readelf: -A
+#name: C6X compatibility attribute, directives 1
+#as:
+#source: attr-compatibility-directive-1.s
+
+Attribute Section: c6xabi
+File Attributes
+  Tag_ISA: C674x
+  Tag_ABI_compatibility: flag = 1, vendor = gnu
diff --git a/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.s b/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.s
new file mode 100644
index 0000000..b013058
--- /dev/null
+++ b/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.s
@@ -0,0 +1 @@
+.c6xabi_attribute Tag_ABI_compatibility, 1, "gnu"
diff --git a/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.d b/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.d
new file mode 100644
index 0000000..fc8c39e
--- /dev/null
+++ b/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.d
@@ -0,0 +1,9 @@
+#readelf: -A
+#name: C6X compatibility attribute, directives 2
+#as:
+#source: attr-compatibility-directive-2.s
+
+Attribute Section: c6xabi
+File Attributes
+  Tag_ISA: C674x
+  Tag_ABI_compatibility: flag = 1, vendor = gnu
diff --git a/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.s b/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.s
new file mode 100644
index 0000000..4367b7a
--- /dev/null
+++ b/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.s
@@ -0,0 +1 @@
+.c6xabi_attribute 32, 1, "gnu"