[binutils-gdb] arm: avoid "shadowing" of glibc function name

[Jan Beulich]

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

commit 1db66fb653995e45fa55d44bddf25bdf55efb46a
Author: Jan Beulich <jbeulich@suse.com>
Date:   Thu Jun 10 12:40:11 2021 +0200

    arm: avoid "shadowing" of glibc function name
    
    Old enough glibc has an (unguarded) declaration of index() in string.h,
    which triggers a "shadows a global declaration" warning.

Diff:
---
 gas/ChangeLog       |  8 ++++++++
 gas/config/tc-arm.c | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ab12ba558f1..8ffba29fe76 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2021-06-10  Jan Beulich  <jbeulich@suse.com>
+
+	* config/tc-arm.c (do_bfloat_vfma): Rename index to idx.
+	(do_vusdot): Likewise.
+	(do_vsudot): Likewise.
+	(check_cde_operand): Likewise.
+	(do_vdot): Likewise.
+
 2021-06-10  Jan Beulich  <jbeulich@suse.com>
 
 	* config/tc-arm.c (reg_expected_msgs): Add REG_TYPE_ZR entry.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 895718c9920..fa023b4461e 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -17937,14 +17937,14 @@ do_bfloat_vfma (void)
       neon_check_type (3, rs, N_EQK, N_EQK, N_BF16 | N_KEY);
 
       inst.instruction |= (1 << 25);
-      int index = inst.operands[2].reg & 0xf;
-      constraint (!(index < 4), _("index must be in the range 0 to 3"));
+      int idx = inst.operands[2].reg & 0xf;
+      constraint (!(idx < 4), _("index must be in the range 0 to 3"));
       inst.operands[2].reg >>= 4;
       constraint (!(inst.operands[2].reg < 8),
 		  _("indexed register must be less than 8"));
       neon_three_args (t_bit);
-      inst.instruction |= ((index & 1) << 3);
-      inst.instruction |= ((index & 2) << 4);
+      inst.instruction |= ((idx & 1) << 3);
+      inst.instruction |= ((idx & 2) << 4);
     }
   else
     {
@@ -21579,13 +21579,13 @@ do_vusdot (void)
       neon_check_type (3, rs, N_EQK, N_EQK, N_S8 | N_KEY);
 
       inst.instruction |= (1 << 25);
-      int index = inst.operands[2].reg & 0xf;
-      constraint ((index != 1 && index != 0), _("index must be 0 or 1"));
+      int idx = inst.operands[2].reg & 0xf;
+      constraint ((idx != 1 && idx != 0), _("index must be 0 or 1"));
       inst.operands[2].reg >>= 4;
       constraint (!(inst.operands[2].reg < 16),
 		  _("indexed register must be less than 16"));
       neon_three_args (rs == NS_QQS);
-      inst.instruction |= (index << 5);
+      inst.instruction |= (idx << 5);
     }
   else
     {
@@ -21607,13 +21607,13 @@ do_vsudot (void)
       neon_check_type (3, rs, N_EQK, N_EQK, N_U8 | N_KEY);
 
       inst.instruction |= (1 << 25);
-      int index = inst.operands[2].reg & 0xf;
-      constraint ((index != 1 && index != 0), _("index must be 0 or 1"));
+      int idx = inst.operands[2].reg & 0xf;
+      constraint ((idx != 1 && idx != 0), _("index must be 0 or 1"));
       inst.operands[2].reg >>= 4;
       constraint (!(inst.operands[2].reg < 16),
 		  _("indexed register must be less than 16"));
       neon_three_args (rs == NS_QQS);
-      inst.instruction |= (index << 5);
+      inst.instruction |= (idx << 5);
     }
 }
 
@@ -21642,10 +21642,10 @@ do_vummla (void)
 }
 
 static void
-check_cde_operand (size_t index, int is_dual)
+check_cde_operand (size_t idx, int is_dual)
 {
-  unsigned Rx = inst.operands[index].reg;
-  bool isvec = inst.operands[index].isvec;
+  unsigned Rx = inst.operands[idx].reg;
+  bool isvec = inst.operands[idx].isvec;
   if (is_dual == 0 && thumb_mode)
     constraint (
 		!((Rx <= 14 && Rx != 13) || (Rx == REG_PC && isvec)),
@@ -22289,13 +22289,13 @@ do_vdot (void)
       neon_check_type (3, rs, N_EQK, N_EQK, N_BF16 | N_KEY);
 
       inst.instruction |= (1 << 25);
-      int index = inst.operands[2].reg & 0xf;
-      constraint ((index != 1 && index != 0), _("index must be 0 or 1"));
+      int idx = inst.operands[2].reg & 0xf;
+      constraint ((idx != 1 && idx != 0), _("index must be 0 or 1"));
       inst.operands[2].reg >>= 4;
       constraint (!(inst.operands[2].reg < 16),
 		  _("indexed register must be less than 16"));
       neon_three_args (rs == NS_QQS);
-      inst.instruction |= (index << 5);
+      inst.instruction |= (idx << 5);
     }
   else
     {