[PATCH] ld: fix build with old glibc / gcc

Jan Beulich jbeulich@suse.com
Fri Jul 7 12:01:07 GMT 2023


"rename" conflicts with a function of that name, which gcc from that
same timeframe then complains about. Use a name matching that of
struct input_remap's respective field.
---
Nick, I expect this also wants to go on the branch.

--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -199,7 +199,7 @@ ldfile_add_remap_file (const char * file
 	  continue;
 	}
 
-      char * rename = p;
+      char * renamed = p;
 
       /* Advance past the rename entry.  */
       while (*p && *p != '=' && *p != ' ' && *p != '\t' && *p != '\f'
@@ -208,7 +208,7 @@ ldfile_add_remap_file (const char * file
       /* And terminate it.  */
       *p = '\0';
 
-      ldfile_add_remap (pattern, rename);
+      ldfile_add_remap (pattern, renamed);
     }
   while (! feof (f));
 


More information about the Binutils mailing list