bfd:

	* elf32-tic6x.c (elf32_tic6x_obj_attrs_handle_unknown): New.
	(elf32_tic6x_merge_attributes): Use
	_bfd_elf_merge_unknown_attribute_low and
	_bfd_elf_merge_unknown_attribute_list.
	(elf_backend_obj_attrs_handle_unknown): Define.

ld/testsuite:
	* ld-tic6x/attr-unknown-1.d, ld-tic6x/attr-unknown-1000-1.s,
	ld-tic6x/attr-unknown-1000-2.s, ld-tic6x/attr-unknown-1024-1.s,
	ld-tic6x/attr-unknown-2.d, ld-tic6x/attr-unknown-3.d,
	ld-tic6x/attr-unknown-4.d, ld-tic6x/attr-unknown-5.d,
	ld-tic6x/attr-unknown-54-1.s, ld-tic6x/attr-unknown-55-a.s,
	ld-tic6x/attr-unknown-6.d, ld-tic6x/attr-unknown-7.d,
	ld-tic6x/attr-unknown-71-a.s, ld-tic6x/attr-unknown-71-b.s: New
	tests.

17 files changed, 119 insertions, 0 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 22dd1909ab8..78b904af7ca 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,13 @@
 2010-11-05  Joseph Myers  <joseph@codesourcery.com>
 
+	* elf32-tic6x.c (elf32_tic6x_obj_attrs_handle_unknown): New.
+	(elf32_tic6x_merge_attributes): Use
+	_bfd_elf_merge_unknown_attribute_low and
+	_bfd_elf_merge_unknown_attribute_list.
+	(elf_backend_obj_attrs_handle_unknown): Define.
+
+2010-11-05  Joseph Myers  <joseph@codesourcery.com>
+
 	* elf-attrs.c (_bfd_elf_merge_unknown_attribute_low,
 	_bfd_elf_merge_unknown_attribute_list): Correct test for matching
 	string attributes.
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 4e91d7497db..3674a3a8ad1 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -1679,6 +1679,26 @@ elf32_tic6x_obj_attrs_order (int num)
   return num;
 }
 
+static bfd_boolean
+elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag)
+{
+  if ((tag & 127) < 64)
+    {
+      _bfd_error_handler
+	(_("%B: error: unknown mandatory EABI object attribute %d"),
+	 abfd, tag);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+  else
+    {
+      _bfd_error_handler
+	(_("%B: warning: unknown EABI object attribute %d"),
+	 abfd, tag);
+      return TRUE;
+    }
+}
+
 /* Merge the Tag_ISA attribute values ARCH1 and ARCH2
    and return the merged value.  At present, all merges succeed, so no
    return value for errors is defined.  */
@@ -1938,7 +1958,13 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd)
 	    out_attr[i].s = NULL;
 	  break;
 
+	case Tag_ABI_compatibility:
+	  /* Merged in _bfd_elf_merge_object_attributes.  */
+	  break;
+
 	default:
+	  result
+	    = result && _bfd_elf_merge_unknown_attribute_low (ibfd, obfd, i);
 	  break;
 	}
 
@@ -1950,6 +1976,8 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd)
   if (!_bfd_elf_merge_object_attributes (ibfd, obfd))
     return FALSE;
 
+  result &= _bfd_elf_merge_unknown_attribute_list (ibfd, obfd);
+
   return result;
 }
 
@@ -1984,6 +2012,7 @@ elf32_tic6x_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 #define elf_backend_may_use_rel_p	1
 #define elf_backend_may_use_rela_p	1
 #define elf_backend_obj_attrs_arg_type	elf32_tic6x_obj_attrs_arg_type
+#define elf_backend_obj_attrs_handle_unknown	elf32_tic6x_obj_attrs_handle_unknown
 #define elf_backend_obj_attrs_order	elf32_tic6x_obj_attrs_order
 #define elf_backend_obj_attrs_section	".c6xabi.attributes"
 #define elf_backend_obj_attrs_section_type	SHT_C6000_ATTRIBUTES
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 8da742a80e5..e5b16230974 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-05  Joseph Myers  <joseph@codesourcery.com>
+
+	* ld-tic6x/attr-unknown-1.d, ld-tic6x/attr-unknown-1000-1.s,
+	ld-tic6x/attr-unknown-1000-2.s, ld-tic6x/attr-unknown-1024-1.s,
+	ld-tic6x/attr-unknown-2.d, ld-tic6x/attr-unknown-3.d,
+	ld-tic6x/attr-unknown-4.d, ld-tic6x/attr-unknown-5.d,
+	ld-tic6x/attr-unknown-54-1.s, ld-tic6x/attr-unknown-55-a.s,
+	ld-tic6x/attr-unknown-6.d, ld-tic6x/attr-unknown-7.d,
+	ld-tic6x/attr-unknown-71-a.s, ld-tic6x/attr-unknown-71-b.s: New
+	tests.
+
 2010-11-05  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* ld-plugin/plugin.exp (testobjfiles): Dont use HOSTING_CRT0.
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-1.d b/ld/testsuite/ld-tic6x/attr-unknown-1.d
new file mode 100644
index 00000000000..e2b8f4542ac
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-1.d
@@ -0,0 +1,6 @@
+#name: C6X unknown attribute merging 1
+#as: -mlittle-endian
+#ld: -r -melf32_tic6x_le
+#source: attr-unknown-54-1.s
+#source: attr-unknown-54-1.s
+#error: .*error: unknown mandatory EABI object attribute 54
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-1000-1.s b/ld/testsuite/ld-tic6x/attr-unknown-1000-1.s
new file mode 100644
index 00000000000..bb173452d60
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-1000-1.s
@@ -0,0 +1 @@
+.c6xabi_attribute 1000, 1
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-1000-2.s b/ld/testsuite/ld-tic6x/attr-unknown-1000-2.s
new file mode 100644
index 00000000000..658868be3cc
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-1000-2.s
@@ -0,0 +1 @@
+.c6xabi_attribute 1000, 2
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-1024-1.s b/ld/testsuite/ld-tic6x/attr-unknown-1024-1.s
new file mode 100644
index 00000000000..e2d7e4f411c
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-1024-1.s
@@ -0,0 +1 @@
+.c6xabi_attribute 1024, 1
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-2.d b/ld/testsuite/ld-tic6x/attr-unknown-2.d
new file mode 100644
index 00000000000..8062a9a1797
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-2.d
@@ -0,0 +1,6 @@
+#name: C6X unknown attribute merging 2
+#as: -mlittle-endian
+#ld: -r -melf32_tic6x_le
+#source: attr-unknown-55-a.s
+#source: attr-unknown-55-a.s
+#error: .*error: unknown mandatory EABI object attribute 55
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-3.d b/ld/testsuite/ld-tic6x/attr-unknown-3.d
new file mode 100644
index 00000000000..ed7acdcf191
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-3.d
@@ -0,0 +1,12 @@
+#name: C6X unknown attribute merging 3
+#as: -mlittle-endian
+#ld: -r -melf32_tic6x_le
+#source: attr-unknown-71-a.s
+#source: attr-unknown-71-a.s
+#warning: .*warning: unknown EABI object attribute 71
+#readelf: -A
+
+Attribute Section: c6xabi
+File Attributes
+  Tag_ISA: C674x
+  Tag_unknown_71: "a"
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-4.d b/ld/testsuite/ld-tic6x/attr-unknown-4.d
new file mode 100644
index 00000000000..dd165d67dfc
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-4.d
@@ -0,0 +1,11 @@
+#name: C6X unknown attribute merging 4
+#as: -mlittle-endian
+#ld: -r -melf32_tic6x_le
+#source: attr-unknown-71-a.s
+#source: attr-unknown-71-b.s
+#warning: .*warning: unknown EABI object attribute 71
+#readelf: -A
+
+Attribute Section: c6xabi
+File Attributes
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-5.d b/ld/testsuite/ld-tic6x/attr-unknown-5.d
new file mode 100644
index 00000000000..5a17b9a68aa
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-5.d
@@ -0,0 +1,12 @@
+#name: C6X unknown attribute merging 5
+#as: -mlittle-endian
+#ld: -r -melf32_tic6x_le
+#source: attr-unknown-1000-1.s
+#source: attr-unknown-1000-1.s
+#warning: .*warning: unknown EABI object attribute 1000
+#readelf: -A
+
+Attribute Section: c6xabi
+File Attributes
+  Tag_ISA: C674x
+  Tag_unknown_1000: 1 \(0x1\)
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-54-1.s b/ld/testsuite/ld-tic6x/attr-unknown-54-1.s
new file mode 100644
index 00000000000..8f0600ef0ee
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-54-1.s
@@ -0,0 +1 @@
+.c6xabi_attribute 54, 1
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-55-a.s b/ld/testsuite/ld-tic6x/attr-unknown-55-a.s
new file mode 100644
index 00000000000..7b09d2b6068
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-55-a.s
@@ -0,0 +1 @@
+.c6xabi_attribute 55, "a"
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-6.d b/ld/testsuite/ld-tic6x/attr-unknown-6.d
new file mode 100644
index 00000000000..65096937146
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-6.d
@@ -0,0 +1,11 @@
+#name: C6X unknown attribute merging 6
+#as: -mlittle-endian
+#ld: -r -melf32_tic6x_le
+#source: attr-unknown-1000-1.s
+#source: attr-unknown-1000-2.s
+#warning: .*warning: unknown EABI object attribute 1000
+#readelf: -A
+
+Attribute Section: c6xabi
+File Attributes
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-7.d b/ld/testsuite/ld-tic6x/attr-unknown-7.d
new file mode 100644
index 00000000000..79ab8c5e696
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-7.d
@@ -0,0 +1,6 @@
+#name: C6X unknown attribute merging 7
+#as: -mlittle-endian
+#ld: -r -melf32_tic6x_le
+#source: attr-unknown-1024-1.s
+#source: attr-unknown-1024-1.s
+#error: .*error: unknown mandatory EABI object attribute 1024
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-71-a.s b/ld/testsuite/ld-tic6x/attr-unknown-71-a.s
new file mode 100644
index 00000000000..b7bf77e3eec
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-71-a.s
@@ -0,0 +1 @@
+.c6xabi_attribute 71, "a"
diff --git a/ld/testsuite/ld-tic6x/attr-unknown-71-b.s b/ld/testsuite/ld-tic6x/attr-unknown-71-b.s
new file mode 100644
index 00000000000..de0f18bcce8
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-71-b.s
@@ -0,0 +1 @@
+.c6xabi_attribute 71, "b"