projects
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* dw2gencfi.c (dwcfi_seg_list): New struct.
[binutils-gdb.git]
/
bfd
/
archive64.c
diff --git
a/bfd/archive64.c
b/bfd/archive64.c
index ba0a187e65cba1b15a9c0e85ccc4f77cf8685fd9..bbc4c3f72f9e0acb4b01eb36fae31cb21dd79dfc 100644
(file)
--- a/
bfd/archive64.c
+++ b/
bfd/archive64.c
@@
-1,30
+1,31
@@
/* MIPS-specific support for 64-bit ELF
/* MIPS-specific support for 64-bit ELF
- Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- Free Software Foundation, Inc.
+ Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
, 2005, 2006, 2007,
+
2010
Free Software Foundation, Inc.
Ian Lance Taylor, Cygnus Support
Linker support added by Mark Mitchell, CodeSourcery, LLC.
<mark@codesourcery.com>
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 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 2
of the License, or
-(at your option) any later version.
+
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,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+
This program is distributed in the hope that it will be useful,
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
/* This file supports the 64-bit (MIPS) ELF archives. */
/* This file supports the 64-bit (MIPS) ELF archives. */
-#include "bfd.h"
#include "sysdep.h"
#include "sysdep.h"
+#include "bfd.h"
#include "libbfd.h"
#include "aout/ar.h"
#include "libbfd.h"
#include "aout/ar.h"
@@
-42,7
+43,6
@@
bfd_elf64_archive_slurp_armap (bfd *abfd)
{
struct artdata *ardata = bfd_ardata (abfd);
char nextname[17];
{
struct artdata *ardata = bfd_ardata (abfd);
char nextname[17];
- file_ptr arhdrpos;
bfd_size_type i, parsed_size, nsymz, stringsize, carsym_size, ptrsize;
struct areltdata *mapdata;
bfd_byte int_buf[8];
bfd_size_type i, parsed_size, nsymz, stringsize, carsym_size, ptrsize;
struct areltdata *mapdata;
bfd_byte int_buf[8];
@@
-54,7
+54,6
@@
bfd_elf64_archive_slurp_armap (bfd *abfd)
ardata->symdefs = NULL;
/* Get the name of the first element. */
ardata->symdefs = NULL;
/* Get the name of the first element. */
- arhdrpos = bfd_tell (abfd);
i = bfd_bread (nextname, 16, abfd);
if (i == 0)
return TRUE;
i = bfd_bread (nextname, 16, abfd);
if (i == 0)
return TRUE;
@@
-65,10
+64,10
@@
bfd_elf64_archive_slurp_armap (bfd *abfd)
return FALSE;
/* Archives with traditional armaps are still permitted. */
return FALSE;
/* Archives with traditional armaps are still permitted. */
- if (
strncmp (nextname, "/ ", 16) == 0
)
+ if (
CONST_STRNEQ (nextname, "/ ")
)
return bfd_slurp_armap (abfd);
return bfd_slurp_armap (abfd);
- if (
strncmp (nextname, "/SYM64/ ", 16) != 0
)
+ if (
! CONST_STRNEQ (nextname, "/SYM64/ ")
)
{
bfd_has_map (abfd) = FALSE;
return TRUE;
{
bfd_has_map (abfd) = FALSE;
return TRUE;
@@
-94,13
+93,13
@@
bfd_elf64_archive_slurp_armap (bfd *abfd)
ptrsize = 8 * nsymz;
amt = carsym_size + stringsize + 1;
ptrsize = 8 * nsymz;
amt = carsym_size + stringsize + 1;
- ardata->symdefs = bfd_zalloc (abfd, amt);
+ ardata->symdefs =
(struct carsym *)
bfd_zalloc (abfd, amt);
if (ardata->symdefs == NULL)
return FALSE;
carsyms = ardata->symdefs;
stringbase = ((char *) ardata->symdefs) + carsym_size;
if (ardata->symdefs == NULL)
return FALSE;
carsyms = ardata->symdefs;
stringbase = ((char *) ardata->symdefs) + carsym_size;
- raw_armap = bfd_alloc (abfd, ptrsize);
+ raw_armap =
(bfd_byte *)
bfd_alloc (abfd, ptrsize);
if (raw_armap == NULL)
goto release_symdefs;
if (raw_armap == NULL)
goto release_symdefs;
@@
-195,27
+194,27
@@
bfd_elf64_archive_write_armap (bfd *arch,
/* Write out the file offset for the file associated with each
symbol, and remember to keep the offsets padded out. */
/* Write out the file offset for the file associated with each
symbol, and remember to keep the offsets padded out. */
-
- current = arch->archive_head;
count = 0;
count = 0;
- while (current != NULL && count < symbol_count)
+ 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 */
{
/* For each symbol which is used defined in this object, write out
the object file's address in the archive */
- while (map[count].u.abfd == current)
+ 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;
{
bfd_putb64 ((bfd_vma) archive_member_file_ptr, buf);
if (bfd_bwrite (buf, 8, arch) != 8)
return FALSE;
- count++;
}
/* Add size of this archive entry */
archive_member_file_ptr += (arelt_size (current)
+ sizeof (struct ar_hdr));
/* remember about the even alignment */
archive_member_file_ptr += archive_member_file_ptr % 2;
}
/* Add size of this archive entry */
archive_member_file_ptr += (arelt_size (current)
+ sizeof (struct ar_hdr));
/* remember about the even alignment */
archive_member_file_ptr += archive_member_file_ptr % 2;
- current = current->next;
}
/* now write the strings themselves */
}
/* now write the strings themselves */