diff options
| author | Elena Zannoni <ezannoni@kwikemart.cygnus.com> | 2002-11-03 22:29:13 +0000 |
|---|---|---|
| committer | Elena Zannoni <ezannoni@kwikemart.cygnus.com> | 2002-11-03 22:29:13 +0000 |
| commit | b4be33d4f4bea78bc6e0758a8bfee8dd36a3e304 (patch) | |
| tree | 34c41e5e211d3e4c9a31d1de2c0ce96ca1ada629 /bfd/linker.c | |
| parent | 0b2f3640de9a8fdbd2980ad05820506ec6f72cd1 (diff) | |
| download | gdb-b4be33d4f4bea78bc6e0758a8bfee8dd36a3e304.tar.gz | |
merge from mainline
Diffstat (limited to 'bfd/linker.c')
| -rw-r--r-- | bfd/linker.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/bfd/linker.c b/bfd/linker.c index 242f8bd7625..a5ded1f5883 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -449,7 +449,8 @@ _bfd_link_hash_newfunc (entry, table, string) subclass. */ if (entry == NULL) { - entry = bfd_hash_allocate (table, sizeof (struct bfd_link_hash_entry)); + entry = (struct bfd_hash_entry *) + bfd_hash_allocate (table, sizeof (struct bfd_link_hash_entry)); if (entry == NULL) return entry; } @@ -645,8 +646,8 @@ _bfd_generic_link_hash_newfunc (entry, table, string) subclass. */ if (entry == NULL) { - entry = bfd_hash_allocate (table, - sizeof (struct generic_link_hash_entry)); + entry = (struct bfd_hash_entry *) + bfd_hash_allocate (table, sizeof (struct generic_link_hash_entry)); if (entry == NULL) return entry; } @@ -1305,6 +1306,7 @@ generic_link_add_symbol_list (abfd, info, symbol_count, symbols, collect) const char *name; const char *string; struct generic_link_hash_entry *h; + struct bfd_link_hash_entry *bh; name = bfd_asymbol_name (p); if (((p->flags & BSF_INDIRECT) != 0 @@ -1326,12 +1328,12 @@ generic_link_add_symbol_list (abfd, info, symbol_count, symbols, collect) else string = NULL; - h = NULL; + bh = NULL; if (! (_bfd_generic_link_add_one_symbol (info, abfd, name, p->flags, bfd_get_section (p), - p->value, string, false, collect, - (struct bfd_link_hash_entry **) &h))) + p->value, string, false, collect, &bh))) return false; + h = (struct generic_link_hash_entry *) bh; /* If this is a constructor symbol, and the linker didn't do anything with it, then we want to just pass the symbol @@ -2018,7 +2020,7 @@ _bfd_generic_final_link (abfd, info) for (o = abfd->sections; o != NULL; o = o->next) for (p = o->link_order_head; p != NULL; p = p->next) if (p->type == bfd_indirect_link_order) - p->u.indirect.section->linker_mark = true; + p->u.indirect.section->linker_mark = (unsigned int) true; /* Build the output symbol table. */ for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next) |