[binutils-gdb] objcopy: avoid "shadowing" of remove() function name

[Jan Beulich]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3bf4994276269a241d97f8ccb5171fe581baa4cb

commit 3bf4994276269a241d97f8ccb5171fe581baa4cb
Author: Jan Beulich <jbeulich@suse.com>
Date:   Fri Sep 30 10:55:02 2022 +0200

    objcopy: avoid "shadowing" of remove() function name
    
    remove() is a standard library function (declared in stdio.h), which
    triggers a "shadows a global declaration" warning with some gcc versions.

Diff:
---
 binutils/objcopy.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index fc668f00bbc..e9be7633464 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -4091,7 +4091,7 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
 	   && (flags & (SEC_ALLOC | SEC_GROUP)) != 0
 	   && !is_nondebug_keep_contents_section (ibfd, isection))
     {
-      flagword remove = SEC_HAS_CONTENTS | SEC_LOAD | SEC_GROUP;
+      flagword clr = SEC_HAS_CONTENTS | SEC_LOAD | SEC_GROUP;
 
       if (bfd_get_flavour (obfd) == bfd_target_elf_flavour)
 	{
@@ -4100,7 +4100,7 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
 	     being used with GDB, if they were based upon files that
 	     originally contained groups.  */
 	  if (flags & SEC_GROUP)
-	    remove = SEC_LOAD;
+	    clr = SEC_LOAD;
 	  else
 	    make_nobits = true;
 
@@ -4108,9 +4108,9 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
 	     elf.c:copy_private_bfd_data that section flags have not
 	     changed between input and output sections.  This hack
 	     prevents wholesale rewriting of the program headers.  */
-	  isection->flags &= ~remove;
+	  isection->flags &= ~clr;
 	}
-      flags &= ~remove;
+      flags &= ~clr;
     }
 
   osection = bfd_make_section_anyway_with_flags (obfd, name, flags);