2009-01-15 Andrew Stubbs <ams@codesourcery.com>

	bfd/
	* elf-attrs.c (bfd_elf_add_obj_attr_compat): Rename to
	bfd_elf_add_obj_attr_int_string.
	Read Tag_compatibility from its new location in the attribute array,
	rather than the attribute list.
	(_bfd_elf_copy_obj_attributes): bfd_elf_add_obj_attr_compat ->
	bfd_elf_add_obj_attr_int_string.
	(_bfd_elf_parse_attributes): Likewise.
	(_bfd_elf_merge_object_attributes): There's now only one
	Tag_compatibility, and it's in the array, not the list.
	* elf-bfd.h (NUM_KNOWN_OBJ_ATTRIBUTES): Set to 33 to include
	Tag_compatibility.
	(bfd_elf_add_obj_attr_compat): Rename to
	bfd_elf_add_obj_attr_int_string.
	(bfd_elf_add_proc_attr_compat): Rename to
	bfd_elf_add_proc_attr_int_string.
	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Explicitly don't handle
	Tag_compatibility.

	gas/
	* read.c (s_vendor_attribute): bfd_elf_add_obj_attr_compat ->
	bfd_elf_add_obj_attr_int_string.

2 files changed, 6 insertions, 1 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index df4a3d1..7740294 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-15  Andrew Stubbs  <ams@codesourcery.com>
+
+	* read.c (s_vendor_attribute): bfd_elf_add_obj_attr_compat ->
+	bfd_elf_add_obj_attr_int_string.
+
 2009-01-15  Douglas B Rupp  <rupp@gnat.com>
 
 	* configure.tgt(ia64-*-*vms*): New target.
diff --git a/gas/read.c b/gas/read.c
index c6f04d0..e9a8971 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -2121,7 +2121,7 @@ s_vendor_attribute (int vendor)
   switch (type)
     {
     case 3:
-      bfd_elf_add_obj_attr_compat (stdoutput, vendor, i, s);
+      bfd_elf_add_obj_attr_int_string (stdoutput, vendor, tag, i, s);
       break;
     case 2:
       bfd_elf_add_obj_attr_string (stdoutput, vendor, tag, s);