GDB 7.6.50

bfd/archive64.c

-/* MIPS-specific support for 64-bit ELF
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007,
-   2010, 2012  Free Software Foundation, Inc.
+/* Support for 64-bit ELF archives.
+   Copyright 1996-2013 Free Software Foundation, Inc.
    Ian Lance Taylor, Cygnus Support
    Linker support added by Mark Mitchell, CodeSourcery, LLC.
    <mark@codesourcery.com>
 
    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.
@@ skipping 56 matching lines @@
   if (! CONST_STRNEQ (nextname, "/SYM64/         "))
     {
       bfd_has_map (abfd) = FALSE;
       return TRUE;
     }
 
   mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
   if (mapdata == NULL)
     return FALSE;
   parsed_size = mapdata->parsed_size;
-  bfd_release (abfd, mapdata);
+  free (mapdata);
 
   if (bfd_bread (int_buf, 8, abfd) != 8)
     {
       if (bfd_get_error () != bfd_error_system_call)
         bfd_set_error (bfd_error_malformed_archive);
       return FALSE;
     }
 
   nsymz = bfd_getb64 (int_buf);
   stringsize = parsed_size - 8 * nsymz - 8;
@@ skipping 102 matching lines @@
      remembering that each offset is on a two byte boundary.  */
 
   /* Write out the file offset for the file associated with each
      symbol, and remember to keep the offsets padded out.  */
   count = 0;
   for (current = arch->archive_head;
        current != NULL && count < symbol_count;
        current = current->archive_next)
     {
       /* For each symbol which is used defined in this object, write out
-         the object file's address in the archive */
+         the object file's address in the archive.  */
 
       for (;
            count < symbol_count && map[count].u.abfd == current;
            count++)
         {
           bfd_putb64 ((bfd_vma) archive_member_file_ptr, buf);
           if (bfd_bwrite (buf, 8, arch) != 8)
             return FALSE;
         }
+
       /* Add size of this archive entry */
-      archive_member_file_ptr += (arelt_size (current)
-                                  + sizeof (struct ar_hdr));
+      archive_member_file_ptr += sizeof (struct ar_hdr);
+      if (! bfd_is_thin_archive (arch))
+        archive_member_file_ptr += arelt_size (current);
       /* remember about the even alignment */
       archive_member_file_ptr += archive_member_file_ptr % 2;
     }
 
   /* now write the strings themselves */
   for (count = 0; count < symbol_count; count++)
     {
       size_t len = strlen (*map[count].name) + 1;
 
       if (bfd_bwrite (*map[count].name, len, arch) != len)
         return FALSE;
     }
 
   /* The spec says that this should be padded to an 8 byte boundary.
      However, the Irix 6.2 tools do not appear to do this.  */
   while (padding != 0)
     {
       if (bfd_bwrite ("", 1, arch) != 1)
         return FALSE;
       --padding;
     }
 
   return TRUE;
 }