Merge GDB 7.5.1

bfd/elf-attrs.c

 /* ELF attributes support (based on ARM EABI attributes).
-   Copyright 2005, 2006, 2007, 2009, 2010
+   Copyright 2005, 2006, 2007, 2009, 2010, 2012
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ skipping 408 matching lines @@
     }
 }
 
 /* Parse an object attributes section.  */
 void
 _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
 {
   bfd_byte *contents;
   bfd_byte *p;
   bfd_vma len;
-  const char *std_section;
+  const char *std_sec;
 
   contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
   if (!contents)
     return;
   if (!bfd_get_section_contents (abfd, hdr->bfd_section, contents, 0,
                                  hdr->sh_size))
     {
       free (contents);
       return;
     }
   p = contents;
-  std_section = get_elf_backend_data (abfd)->obj_attrs_vendor;
+  std_sec = get_elf_backend_data (abfd)->obj_attrs_vendor;
   if (*(p++) == 'A')
     {
       len = hdr->sh_size - 1;
       while (len > 0)
         {
           int namelen;
           bfd_vma section_len;
           int vendor;
 
           section_len = bfd_get_32 (abfd, p);
           p += 4;
           if (section_len > len)
             section_len = len;
           len -= section_len;
-          namelen = strlen ((char *)p) + 1;
+          namelen = strlen ((char *) p) + 1;
           section_len -= namelen + 4;
-          if (std_section && strcmp ((char *)p, std_section) == 0)
+          if (std_sec && strcmp ((char *) p, std_sec) == 0)
             vendor = OBJ_ATTR_PROC;
-          else if (strcmp ((char *)p, "gnu") == 0)
+          else if (strcmp ((char *) p, "gnu") == 0)
             vendor = OBJ_ATTR_GNU;
           else
             {
               /* Other vendor section.  Ignore it.  */
               p += namelen + section_len;
               continue;
             }
 
           p += namelen;
           while (section_len > 0)
@@ skipping 217 matching lines @@
         }
 
       if (err_bfd)
         result = result
           && get_elf_backend_data (err_bfd)->obj_attrs_handle_unknown (err_bfd,
                                                                        err_tag);
     }
 
   return result;
 }