summaryrefslogtreecommitdiff
path: root/bfd/merge.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2001-08-09 14:38:04 +0000
committerAlan Modra <amodra@bigpond.net.au>2001-08-09 14:38:04 +0000
commit920777d85f7195aff4486d13868f45bb6e5f8dac (patch)
tree777f22dec6ee289c7c3bf4306bb7cfdb4c9ad2f5 /bfd/merge.c
parent485496bdfb0a0bda3b7c48afca7380a5d30be979 (diff)
downloadbinutils-redhat-920777d85f7195aff4486d13868f45bb6e5f8dac.tar.gz
* coff-rs6000.c: Add missing prototypes.
(xcoff_ppc_relocate_section, xcoff_is_lineno_count_overflow, xcoff_is_reloc_count_overflow, xcoff_loader_symbol_offset, xcoff_loader_reloc_offset): Make static. * dwarf1.c: Add missing prototypes. * dwarf2.c: Add missing prototypes. (struct abbrev_info): Move definition. (struct attr_abbrev, ABBREV_HASH_SIZE, ATTR_ALLOC_CHUNK): Likewise. * elf.c: Add missing prototypes. * elf32-gen.c: Likewise. * elf32-i386.c: Likewise. * elf32-ppc.c: Likewise. (ppc_elf_sort_rela): Use PTR instead of "void *". * elflink.h: Add missing prototypes. Formatting fixes. * merge.c: Add missing prototypes. (last4_eq): Use PTR instead of "void *". (last_eq): Likewise. * syms.c: Add missing prototypes.
Diffstat (limited to 'bfd/merge.c')
-rw-r--r--bfd/merge.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/bfd/merge.c b/bfd/merge.c
index 3d0904153e..49074ece02 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -108,6 +108,12 @@ static struct sec_merge_hash_entry *sec_merge_add
struct sec_merge_sec_info *));
static boolean sec_merge_emit
PARAMS ((bfd *, struct sec_merge_hash_entry *));
+static int cmplengthentry PARAMS ((const PTR, const PTR));
+static int last4_eq PARAMS ((const PTR, const PTR));
+static int last_eq PARAMS ((const PTR, const PTR));
+static boolean record_section
+ PARAMS ((struct sec_merge_info *, struct sec_merge_sec_info *));
+static void merge_strings PARAMS ((struct sec_merge_info *));
/* Routine to create an entry in a section merge hashtab. */
@@ -475,7 +481,8 @@ cmplengthentry (a, b)
static int
last4_eq (a, b)
- const void *a, *b;
+ const PTR a;
+ const PTR b;
{
struct sec_merge_hash_entry * A = (struct sec_merge_hash_entry *) a;
struct sec_merge_hash_entry * B = (struct sec_merge_hash_entry *) b;
@@ -502,7 +509,8 @@ last4_eq (a, b)
static int
last_eq (a, b)
- const void *a, *b;
+ const PTR a;
+ const PTR b;
{
struct sec_merge_hash_entry * A = (struct sec_merge_hash_entry *) a;
struct sec_merge_hash_entry * B = (struct sec_merge_hash_entry *) b;