* [PATCH] ld: fix build with old glibc / gcc
@ 2023-07-07 12:01 Jan Beulich
2023-07-07 12:09 ` Nick Clifton
0 siblings, 1 reply; 3+ messages in thread
From: Jan Beulich @ 2023-07-07 12:01 UTC (permalink / raw)
To: Binutils; +Cc: Nick Clifton
"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));
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ld: fix build with old glibc / gcc
2023-07-07 12:01 [PATCH] ld: fix build with old glibc / gcc Jan Beulich
@ 2023-07-07 12:09 ` Nick Clifton
2023-07-07 12:12 ` Jan Beulich
0 siblings, 1 reply; 3+ messages in thread
From: Nick Clifton @ 2023-07-07 12:09 UTC (permalink / raw)
To: Jan Beulich, Binutils
Hi Jan,
> "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.
It does. I have updated the branch. Please can I leave the master
source update to you ?
Cheers
Nick
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ld: fix build with old glibc / gcc
2023-07-07 12:09 ` Nick Clifton
@ 2023-07-07 12:12 ` Jan Beulich
0 siblings, 0 replies; 3+ messages in thread
From: Jan Beulich @ 2023-07-07 12:12 UTC (permalink / raw)
To: Nick Clifton; +Cc: Binutils
On 07.07.2023 14:09, Nick Clifton wrote:
>> "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.
>
> It does. I have updated the branch. Please can I leave the master
> source update to you ?
Sure, already done.
Jan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-07 12:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-07 12:01 [PATCH] ld: fix build with old glibc / gcc Jan Beulich
2023-07-07 12:09 ` Nick Clifton
2023-07-07 12:12 ` Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).