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.

14 files changed, 71 insertions, 0 deletions

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 0000000..e2b8f45
--- /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 0000000..bb17345
--- /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 0000000..658868b
--- /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 0000000..e2d7e4f
--- /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 0000000..8062a9a
--- /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 0000000..ed7acdc
--- /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 0000000..dd165d6
--- /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 0000000..5a17b9a
--- /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 0000000..8f0600e
--- /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 0000000..7b09d2b
--- /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 0000000..6509693
--- /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 0000000..79ab8c5
--- /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 0000000..b7bf77e
--- /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 0000000..de0f18b
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/attr-unknown-71-b.s
@@ -0,0 +1 @@
+.c6xabi_attribute 71, "b"