espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-22 11:00:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm: avoid "shadowing" of glibc function name

Browse Source 
Old enough glibc has an (unguarded) declaration of index() in string.h,
which triggers a "shadows a global declaration" warning.
This commit is contained in:
Jan Beulich
2021-06-10 12:40:11 +02:00
parent e925962f4e
commit 1db66fb653
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gas/ChangeLog
View File

@ -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> 2021-06-10 Jan Beulich <jbeulich@suse.com>
* config/tc-arm.c (reg_expected_msgs): Add REG_TYPE_ZR entry. * config/tc-arm.c (reg_expected_msgs): Add REG_TYPE_ZR entry.

32
gas/config/tc-arm.c
View File

@ -17937,14 +17937,14 @@ do_bfloat_vfma (void)
neon_check_type (3, rs, N_EQK, N_EQK, N_BF16 | N_KEY); neon_check_type (3, rs, N_EQK, N_EQK, N_BF16 | N_KEY);
inst.instruction |= (1 << 25); inst.instruction |= (1 << 25);
int index = inst.operands[2].reg & 0xf; int idx = inst.operands[2].reg & 0xf;
constraint (!(index < 4), _("index must be in the range 0 to 3")); constraint (!(idx < 4), _("index must be in the range 0 to 3"));
inst.operands[2].reg >>= 4; inst.operands[2].reg >>= 4;
constraint (!(inst.operands[2].reg < 8), constraint (!(inst.operands[2].reg < 8),
_("indexed register must be less than 8")); _("indexed register must be less than 8"));
neon_three_args (t_bit); neon_three_args (t_bit);
inst.instruction |= ((index & 1) << 3); inst.instruction |= ((idx & 1) << 3);
inst.instruction |= ((index & 2) << 4); inst.instruction |= ((idx & 2) << 4);
} }
else else
{ {
@ -21579,13 +21579,13 @@ do_vusdot (void)
neon_check_type (3, rs, N_EQK, N_EQK, N_S8 | N_KEY); neon_check_type (3, rs, N_EQK, N_EQK, N_S8 | N_KEY);
inst.instruction |= (1 << 25); inst.instruction |= (1 << 25);
int index = inst.operands[2].reg & 0xf; int idx = inst.operands[2].reg & 0xf;
constraint ((index != 1 && index != 0), _("index must be 0 or 1")); constraint ((idx != 1 && idx != 0), _("index must be 0 or 1"));
inst.operands[2].reg >>= 4; inst.operands[2].reg >>= 4;
constraint (!(inst.operands[2].reg < 16), constraint (!(inst.operands[2].reg < 16),
_("indexed register must be less than 16")); _("indexed register must be less than 16"));
neon_three_args (rs == NS_QQS); neon_three_args (rs == NS_QQS);
inst.instruction |= (index << 5); inst.instruction |= (idx << 5);
} }
else else
{ {
@ -21607,13 +21607,13 @@ do_vsudot (void)
neon_check_type (3, rs, N_EQK, N_EQK, N_U8 | N_KEY); neon_check_type (3, rs, N_EQK, N_EQK, N_U8 | N_KEY);
inst.instruction |= (1 << 25); inst.instruction |= (1 << 25);
int index = inst.operands[2].reg & 0xf; int idx = inst.operands[2].reg & 0xf;
constraint ((index != 1 && index != 0), _("index must be 0 or 1")); constraint ((idx != 1 && idx != 0), _("index must be 0 or 1"));
inst.operands[2].reg >>= 4; inst.operands[2].reg >>= 4;
constraint (!(inst.operands[2].reg < 16), constraint (!(inst.operands[2].reg < 16),
_("indexed register must be less than 16")); _("indexed register must be less than 16"));
neon_three_args (rs == NS_QQS); neon_three_args (rs == NS_QQS);
inst.instruction |= (index << 5); inst.instruction |= (idx << 5);
} }
} }
@ -21642,10 +21642,10 @@ do_vummla (void)
} }
static 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; unsigned Rx = inst.operands[idx].reg;
bool isvec = inst.operands[index].isvec; bool isvec = inst.operands[idx].isvec;
if (is_dual == 0 && thumb_mode) if (is_dual == 0 && thumb_mode)
constraint ( constraint (
!((Rx <= 14 && Rx != 13) || (Rx == REG_PC && isvec)), !((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); neon_check_type (3, rs, N_EQK, N_EQK, N_BF16 | N_KEY);
inst.instruction |= (1 << 25); inst.instruction |= (1 << 25);
int index = inst.operands[2].reg & 0xf; int idx = inst.operands[2].reg & 0xf;
constraint ((index != 1 && index != 0), _("index must be 0 or 1")); constraint ((idx != 1 && idx != 0), _("index must be 0 or 1"));
inst.operands[2].reg >>= 4; inst.operands[2].reg >>= 4;
constraint (!(inst.operands[2].reg < 16), constraint (!(inst.operands[2].reg < 16),
_("indexed register must be less than 16")); _("indexed register must be less than 16"));
neon_three_args (rs == NS_QQS); neon_three_args (rs == NS_QQS);
inst.instruction |= (index << 5); inst.instruction |= (idx << 5);
} }
else else
{ {