yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow inferring tmp_prefix from the dll name from a def file.

Browse Source
This commit is contained in:
Martin Storsj? 2022-01-22 14:31:22 +00:00 committed by Nick Clifton
parent cc5e40736d
commit 58de646be2
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2022-01-22 Martin Storsjö <martin@martin.st>
* dlltool.c (main): Allow inferring tmp_prefix from the dll name
from a def file.
2022-01-22 Nick Clifton <nickc@redhat.com>
* configure: Regenerate.

34
binutils/dlltool.c
View File

@ -3930,23 +3930,6 @@ main (int ac, char **av)
}
}
if (tmp_prefix == NULL)
{
/* If possible use a deterministic prefix. */
if (dll_name)
{
tmp_prefix = xmalloc (strlen (dll_name) + 2);
sprintf (tmp_prefix, "%s_", dll_name);
for (i = 0; tmp_prefix[i]; i++)
if (!ISALNUM (tmp_prefix[i]))
tmp_prefix[i] = '_';
}
else
{
tmp_prefix = prefix_encode ("d", getpid ());
}
}
for (i = 0; mtable[i].type; i++)
if (strcmp (mtable[i].type, mname) == 0)
break;
@ -4006,6 +3989,23 @@ main (int ac, char **av)
optind++;
}
if (tmp_prefix == NULL)
{
/* If possible use a deterministic prefix. */
if (dll_name)
{
tmp_prefix = xmalloc (strlen (dll_name) + 2);
sprintf (tmp_prefix, "%s_", dll_name);
for (i = 0; tmp_prefix[i]; i++)
if (!ISALNUM (tmp_prefix[i]))
tmp_prefix[i] = '_';
}
else
{
tmp_prefix = prefix_encode ("d", getpid ());
}
}
mangle_defs ();
if (exp_name)