aboutsummaryrefslogtreecommitdiff
path: root/bfd/merge.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2002-06-06 10:47:27 +0000
committerNick Clifton <nickc@redhat.com>2002-06-06 10:47:27 +0000
commit7217313c59cbed12b40cb122de1dc3c609efb2e8 (patch)
tree42bc28d313458f391a1ae7337969a62c1b8d0470 /bfd/merge.c
parent6cb2281567f17d81d5450b3387c954299de8ab70 (diff)
downloadfsf-binutils-gdb-7217313c59cbed12b40cb122de1dc3c609efb2e8.zip
fsf-binutils-gdb-7217313c59cbed12b40cb122de1dc3c609efb2e8.tar.gz
fsf-binutils-gdb-7217313c59cbed12b40cb122de1dc3c609efb2e8.tar.bz2
Include libiberty.h
Diffstat (limited to 'bfd/merge.c')
-rw-r--r--bfd/merge.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/bfd/merge.c b/bfd/merge.c
index e175efd..9af93b0 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -1,22 +1,22 @@
/* SEC_MERGE support.
- Copyright 2001 Free Software Foundation, Inc.
+ Copyright 2001, 2002 Free Software Foundation, Inc.
Written by Jakub Jelinek <jakub@redhat.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 2 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 02111-1307, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* This file contains support for merging duplicate entities within sections,
as used in ELF SHF_MERGE. */
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "sysdep.h"
#include "libbfd.h"
#include "hashtab.h"
+#include "libiberty.h"
struct sec_merge_sec_info;
@@ -38,7 +39,8 @@ struct sec_merge_hash_entry
/* Start of this string needs to be aligned to
alignment octets (not 1 << align). */
unsigned int alignment;
- union {
+ union
+ {
/* Index within the merged section. */
bfd_size_type index;
/* Entity size (if present in suffix hash tables). */
@@ -144,7 +146,7 @@ sec_merge_hash_newfunc (entry, table, string)
ret->next = NULL;
}
- return (struct bfd_hash_entry *)ret;
+ return (struct bfd_hash_entry *) ret;
}
/* Look up an entry in a section merge hash table. */