svn commit: r272524 - in head/contrib/binutils: bfd include/elf

[Andrew Turner]

Author: andrew
Date: Sat Oct  4 14:30:16 2014
New Revision: 272524
URL: https://svnweb.freebsd.org/changeset/base/272524

Log:
  Silence a warning about Tag_Virtualization_use being unknown. We don't
  handle merging this tag correctly, however it's unused.

Modified:
  head/contrib/binutils/bfd/elf32-arm.c
  head/contrib/binutils/include/elf/arm.h

Modified: head/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- head/contrib/binutils/bfd/elf32-arm.c	Sat Oct  4 14:17:30 2014	(r272523)
+++ head/contrib/binutils/bfd/elf32-arm.c	Sat Oct  4 14:30:16 2014	(r272524)
@@ -6965,7 +6965,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib
 
   for (; in_list; in_list = in_list->next)
     {
-      if ((in_list->tag & 128) < 64)
+      if ((in_list->tag & 128) < 64
+          && in_list->tag != Tag_Virtualization_use)
 	{
 	  _bfd_error_handler
 	    (_("Warning: %B: Unknown EABI object attribute %d"),

Modified: head/contrib/binutils/include/elf/arm.h
==============================================================================
--- head/contrib/binutils/include/elf/arm.h	Sat Oct  4 14:17:30 2014	(r272523)
+++ head/contrib/binutils/include/elf/arm.h	Sat Oct  4 14:30:16 2014	(r272524)
@@ -271,6 +271,8 @@ enum
   Tag_ABI_optimization_goals,
   Tag_ABI_FP_optimization_goals,
   /* 32 is generic.  */
+
+  Tag_Virtualization_use = 68,
 };
 
 #endif