mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-18 12:24:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elflink.h (elf_link_add_object_symbols): When there is a size

Browse Source 
change, use the larger size.  From H.J. Lu <hjl@gnu.ai.mit.edu>.
This commit is contained in:
Ian Lance Taylor 1997-04-02 22:17:35 +00:00
parent d73607c5b5
commit f74e2365dd
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bfd/ChangeLog
View File

@ -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>
* 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-m10300.c: Rename from elf32-mn10300.c.
* cpu-m10200.c: Rename from cpu-mn10200.c

12
bfd/elflink.h
View File

@ -998,11 +998,15 @@ elf_link_add_object_symbols (abfd, info)
{
if (h->size != 0 && h->size != sym.st_size && ! size_change_ok)
(*_bfd_error_handler)
("Warning: size of symbol `%s' changed from %lu to %lu in %s",
name, (unsigned long) h->size, (unsigned long) sym.st_size,
bfd_get_filename (abfd));
("Warning: size of symbol `%s' was %lu, but in %s is %lu; using %lu",
name, (unsigned long) h->size,
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
&& (definition || h->type == STT_NOTYPE))