Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

elf: Always append ".COUNT" to local symbols

Browse Source 
Always append ".COUNT" to local symbols to avoid potential conflicts
with existing local symbol "XXX.COUNT".

bfd/

	PR ld/27825
	* elflink.c (elf_link_output_symstrtab): Always append ".COUNT"
	to local symbols.

ld/

	PR ld/27825
	* testsuite/ld-elf/pr27825-1.d: New file.
	* testsuite/ld-elf/pr27825-1a.s: Likewise.
	* testsuite/ld-elf/pr27825-1b.s: Likewise.
	* testsuite/ld-elf/pr27825-2.d: Likewise.
	* testsuite/ld-elf/pr27825-2a.s: Likewise.
	* testsuite/ld-elf/pr27825-2b.s: Likewise.
This commit is contained in:
H.J. Lu
2021-05-05 20:28:39 -07:00
parent 9311cd60e1
commit 4467df35a9
11 changed files with 99 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
bfd/elflink.c
View File

@@ -9830,6 +9830,9 @@ elf_link_output_symstrtab (void *finf,
&& ELF_ST_BIND (elfsym->st_info) == STB_LOCAL)
{
struct local_hash_entry *lh;
size_t count_len;
size_t base_len;
char buf[30];
switch (ELF_ST_TYPE (elfsym->st_info))
{
case STT_FILE:
@@ -9840,28 +9843,24 @@ elf_link_output_symstrtab (void *finf,
(&flinfo->local_hash_table, name, true, false);
if (lh == NULL)
return 0;
if (lh->count)
/* Always append ".COUNT" to local symbols to avoid
potential conflicts with local symbol "XXX.COUNT". */
sprintf (buf, "%lx", lh->count);
base_len = lh->size;
if (!base_len)
{
/* Append ".COUNT" to duplicated local symbols. */
size_t count_len;
size_t base_len = lh->size;
char buf[30];
sprintf (buf, "%lx", lh->count);
if (!base_len)
{
base_len = strlen (name);
lh->size = base_len;
}
count_len = strlen (buf);
versioned_name = bfd_alloc (flinfo->output_bfd,
base_len + count_len + 2);
if (versioned_name == NULL)
return 0;
memcpy (versioned_name, name, base_len);
versioned_name[base_len] = '.';
memcpy (versioned_name + base_len + 1, buf,
count_len + 1);
base_len = strlen (name);
lh->size = base_len;
}
count_len = strlen (buf);
versioned_name = bfd_alloc (flinfo->output_bfd,
base_len + count_len + 2);
if (versioned_name == NULL)
return 0;
memcpy (versioned_name, name, base_len);
versioned_name[base_len] = '.';
memcpy (versioned_name + base_len + 1, buf,
count_len + 1);
lh->count++;
break;
}