projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Really remove operands64.d, operands64.s, operands.d and operands.s as
[deliverable/binutils-gdb.git]
/
bfd
/
merge.c
diff --git
a/bfd/merge.c
b/bfd/merge.c
index ccbf5b7e96863222ebff563e14cf1eb37a888a06..c1795d29112f71c5c8748636919cd71cc9ea33c0 100644
(file)
--- a/
bfd/merge.c
+++ b/
bfd/merge.c
@@
-1,5
+1,6
@@
/* SEC_MERGE support.
/* SEC_MERGE support.
- Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
Written by Jakub Jelinek <jakub@redhat.com>.
This file is part of BFD, the Binary File Descriptor library.
Written by Jakub Jelinek <jakub@redhat.com>.
This file is part of BFD, the Binary File Descriptor library.
@@
-16,7
+17,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street - Fifth Floor, Boston, MA 02110-1301
, USA. */
/* This file contains support for merging duplicate entities within sections,
as used in ELF SHF_MERGE. */
/* This file contains support for merging duplicate entities within sections,
as used in ELF SHF_MERGE. */
@@
-241,7
+242,8
@@
sec_merge_init (unsigned int entsize, bfd_boolean strings)
if (table == NULL)
return NULL;
if (table == NULL)
return NULL;
- if (! bfd_hash_table_init (&table->table, sec_merge_hash_newfunc))
+ if (! bfd_hash_table_init_n (&table->table, sec_merge_hash_newfunc,
+ sizeof (struct sec_merge_hash_entry), 16699))
{
free (table);
return NULL;
{
free (table);
return NULL;
@@
-696,8
+698,10
@@
alloc_failure:
with _bfd_merge_section. */
bfd_boolean
with _bfd_merge_section. */
bfd_boolean
-_bfd_merge_sections (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *info,
- void *xsinfo, void (*remove_hook) (bfd *, asection *))
+_bfd_merge_sections (bfd *abfd ATTRIBUTE_UNUSED,
+ struct bfd_link_info *info ATTRIBUTE_UNUSED,
+ void *xsinfo,
+ void (*remove_hook) (bfd *, asection *))
{
struct sec_merge_info *sinfo;
{
struct sec_merge_info *sinfo;
@@
-762,7
+766,7
@@
_bfd_merge_sections (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *info,
the hash table at all. */
for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next)
if (secinfo->first_str == NULL)
the hash table at all. */
for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next)
if (secinfo->first_str == NULL)
-
_bfd_strip_section_from_output (info, secinfo->sec)
;
+
secinfo->sec->flags |= SEC_EXCLUDE
;
}
return TRUE;
}
return TRUE;
This page took
0.027935 seconds
and
4
git commands to generate.