espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-30 17:31:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

bfd/mmo.c (MMIX): Fix massive gcc LTO testsuite failures.

Browse Source 
* mmo.c (mmo_write_symbols_and_terminator): Skip symbol-type
	assignment loop for bfd plugin objects.
This commit is contained in:
Hans-Peter Nilsson
2015-07-29 05:39:27 +02:00
parent a66f09dd91
commit 11509220a0
2 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2015-07-29 Hans-Peter Nilsson <hp@bitrange.com>
* mmo.c (mmo_write_symbols_and_terminator): Skip symbol-type
assignment loop for bfd plugin objects.
2015-07-28 Alan Modra <amodra@gmail.com> 2015-07-28 Alan Modra <amodra@gmail.com>
* elf.c (_bfd_elf_map_sections_to_segments): Do not make a new * elf.c (_bfd_elf_map_sections_to_segments): Do not make a new

100
bfd/mmo.c
View File

@ -2934,59 +2934,65 @@ mmo_write_symbols_and_terminator (bfd *abfd)
count++; count++;
} }
for (i = 0, serno = 1; i < count && table[i] != NULL; i++) /* Don't bother inspecting symbols in plugin dummy objects; their
symbols aren't fully inspectable. */
if ((abfd->flags & BFD_PLUGIN) == 0)
{ {
asymbol *s = table[i]; for (i = 0, serno = 1; i < count && table[i] != NULL; i++)
/* It's not enough to consult bfd_is_local_label, since it does not
mean "local" in the sense of linkable-and-observable-after-link.
Let's just check the BSF_GLOBAL flag.
Also, don't export symbols with characters not in the allowed set. */
if ((s->flags & (BSF_DEBUGGING|BSF_GLOBAL)) == BSF_GLOBAL
&& strspn (s->name,
valid_mmo_symbol_character_set) == strlen (s->name))
{ {
struct mmo_symbol sym; asymbol *s = table[i];
memset (&sym, 0, sizeof (sym));
/* Need to strip const here; strdup:ing would leak and the /* It's not enough to consult bfd_is_local_label, since it does not
existing string must be safe to reuse. */ mean "local" in the sense of linkable-and-observable-after-link.
sym.name = (char *) s->name; Let's just check the BSF_GLOBAL flag.
sym.value =
s->value
+ s->section->output_section->vma
+ s->section->output_offset;
if (bfd_is_und_section (s->section)) Also, don't export symbols with characters not in the
sym.sym_type = mmo_undef_sym; allowed set. */
else if (strcmp (s->section->name, MMO_DATA_SECTION_NAME) == 0 if ((s->flags & (BSF_DEBUGGING|BSF_GLOBAL)) == BSF_GLOBAL
/* The encoding of data symbols require that the "rest" && strspn (s->name,
of the value fits in 6 bytes, so the upper two bytes valid_mmo_symbol_character_set) == strlen (s->name))
must be 0x2000. All other symbols get to be the
absolute type. */
&& (sym.value >> 48) == 0x2000)
sym.sym_type = mmo_data_sym;
else if (strcmp (s->section->name, MMIX_REG_SECTION_NAME) == 0)
sym.sym_type = mmo_reg_sym;
else if (strcmp (s->section->name,
MMIX_REG_CONTENTS_SECTION_NAME) == 0)
{ {
sym.sym_type = mmo_reg_sym; struct mmo_symbol sym;
sym.value /= 8; memset (&sym, 0, sizeof (sym));
/* Need to strip const here; strdup:ing would leak and the
existing string must be safe to reuse. */
sym.name = (char *) s->name;
sym.value =
s->value
+ s->section->output_section->vma
+ s->section->output_offset;
if (bfd_is_und_section (s->section))
sym.sym_type = mmo_undef_sym;
else if (strcmp (s->section->name, MMO_DATA_SECTION_NAME) == 0
/* The encoding of data symbols require that the "rest"
of the value fits in 6 bytes, so the upper two bytes
must be 0x2000. All other symbols get to be the
absolute type. */
&& (sym.value >> 48) == 0x2000)
sym.sym_type = mmo_data_sym;
else if (strcmp (s->section->name, MMIX_REG_SECTION_NAME) == 0)
sym.sym_type = mmo_reg_sym;
else if (strcmp (s->section->name,
MMIX_REG_CONTENTS_SECTION_NAME) == 0)
{
sym.sym_type = mmo_reg_sym;
sym.value /= 8;
}
else
sym.sym_type = mmo_abs_sym;
/* FIXME: We assume the order of the received symbols is an
ordered mapping of the serial numbers. This is not
necessarily true if we e.g. objcopy a mmo file to another and
there are gaps in the numbering. Not sure if this can
happen. Not sure what to do. */
sym.serno = serno++;
if (! mmo_internal_add_3_sym (abfd, &root, &sym))
return FALSE;
} }
else
sym.sym_type = mmo_abs_sym;
/* FIXME: We assume the order of the received symbols is an
ordered mapping of the serial numbers. This is not
necessarily true if we e.g. objcopy a mmo file to another and
there are gaps in the numbering. Not sure if this can
happen. Not sure what to do. */
sym.serno = serno++;
if (! mmo_internal_add_3_sym (abfd, &root, &sym))
return FALSE;
} }
} }