From: Martin Storsj? <martin@martin.st>
Date: Wed, 16 Mar 2022 15:01:30 +0000 (+0000)
Subject: dlltool: Use the output name as basis for deterministic temp prefixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d65c0ddddd85645cab6f11fd711d21638a74489f;p=binutils-gdb.git

dlltool: Use the output name as basis for deterministic temp prefixes

	PR 28885
	* dlltool.c (main): use imp_name rather than dll_name when
	generating a temporary file name.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 6d49d8c7125..127ee5c50d1 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2022-03-16  Martin Storsjö  <martin@martin.st>
+
+	PR 28885
+	* dlltool.c (main): use imp_name rather than dll_name when
+	generating a temporary file name.
+
 2022-03-16  Simon Marchi  <simon.marchi@efficios.com>
 
 	* readelf.c (dump_relocations): Handle EM_AMDGPU.
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index d95bf3f5470..89871510b45 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -3992,10 +3992,11 @@ main (int ac, char **av)
   if (tmp_prefix == NULL)
     {
       /* If possible use a deterministic prefix.  */
-      if (dll_name)
+      if (imp_name || delayimp_name)
         {
-          tmp_prefix = xmalloc (strlen (dll_name) + 2);
-          sprintf (tmp_prefix, "%s_", dll_name);
+          const char *input = imp_name ? imp_name : delayimp_name;
+          tmp_prefix = xmalloc (strlen (input) + 2);
+          sprintf (tmp_prefix, "%s_", input);
           for (i = 0; tmp_prefix[i]; i++)
             if (!ISALNUM (tmp_prefix[i]))
               tmp_prefix[i] = '_';