* elflink.h (elf_link_add_object_symbols): When there is a size
change, use the larger size. From H.J. Lu <hjl@gnu.ai.mit.edu>.
This commit is contained in:
parent
d73607c5b5
commit
f74e2365dd
|
@ -6,6 +6,9 @@ Wed Apr 2 16:19:41 1997 Mike Meissner <meissner@cygnus.com>
|
||||||
|
|
||||||
Wed Apr 2 10:49:07 1997 Ian Lance Taylor <ian@cygnus.com>
|
Wed Apr 2 10:49:07 1997 Ian Lance Taylor <ian@cygnus.com>
|
||||||
|
|
||||||
|
* elflink.h (elf_link_add_object_symbols): When there is a size
|
||||||
|
change, use the larger size. From H.J. Lu <hjl@gnu.ai.mit.edu>.
|
||||||
|
|
||||||
* elf-m10200.c: Rename from elf32-mn10200.c.
|
* elf-m10200.c: Rename from elf32-mn10200.c.
|
||||||
* elf-m10300.c: Rename from elf32-mn10300.c.
|
* elf-m10300.c: Rename from elf32-mn10300.c.
|
||||||
* cpu-m10200.c: Rename from cpu-mn10200.c
|
* cpu-m10200.c: Rename from cpu-mn10200.c
|
||||||
|
|
|
@ -998,11 +998,15 @@ elf_link_add_object_symbols (abfd, info)
|
||||||
{
|
{
|
||||||
if (h->size != 0 && h->size != sym.st_size && ! size_change_ok)
|
if (h->size != 0 && h->size != sym.st_size && ! size_change_ok)
|
||||||
(*_bfd_error_handler)
|
(*_bfd_error_handler)
|
||||||
("Warning: size of symbol `%s' changed from %lu to %lu in %s",
|
("Warning: size of symbol `%s' was %lu, but in %s is %lu; using %lu",
|
||||||
name, (unsigned long) h->size, (unsigned long) sym.st_size,
|
name, (unsigned long) h->size,
|
||||||
bfd_get_filename (abfd));
|
bfd_get_filename (abfd), (unsigned long) sym.st_size,
|
||||||
|
(h->size < sym.st_size
|
||||||
|
? (unsigned long) sym.st_size
|
||||||
|
: (unsigned long) h->size));
|
||||||
|
|
||||||
h->size = sym.st_size;
|
if (h->size < sym.st_size)
|
||||||
|
h->size = sym.st_size;
|
||||||
}
|
}
|
||||||
if (ELF_ST_TYPE (sym.st_info) != STT_NOTYPE
|
if (ELF_ST_TYPE (sym.st_info) != STT_NOTYPE
|
||||||
&& (definition || h->type == STT_NOTYPE))
|
&& (definition || h->type == STT_NOTYPE))
|
||||||
|
|
Loading…
Reference in New Issue