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

bfd/elf32-arm.c: Rename 'popcount' to 'elf32_arm_popcount'

Browse Source 
bfd/elf32_arm.c contains a function 'popcount' which conflicts
with a function of the same name in NetBSD's libc.
This change also changes popcount's 'sum' variable to signed
since the function returns a signed integer.

bfd/
* elf32-arm.c (elf32_arm_popcount): Rename from 'popcount'.  Make
'sum' local variable signed.
This commit is contained in:
Christian Groessler
2016-12-19 13:56:22 +01:00
parent 91068ec6ae
commit b25e998d0b
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2016-12-19 Christian Groessler <chris@groessler.org>
* elf32-arm.c (elf32_arm_popcount): Rename from 'popcount'. Make
'sum' local variable signed.
2016-12-16 fincs <fincs.alt1@gmail.com> 2016-12-16 fincs <fincs.alt1@gmail.com>
* elflink.c (bfd_elf_gc_mark_dynamic_ref_symbol): Add handling * elflink.c (bfd_elf_gc_mark_dynamic_ref_symbol): Add handling

15
bfd/elf32-arm.c
View File

@ -3245,12 +3245,13 @@ ctz (unsigned int mask)
} }
static inline int static inline int
popcount (unsigned int mask) elf32_arm_popcount (unsigned int mask)
{ {
#if GCC_VERSION >= 3004 #if GCC_VERSION >= 3004
return __builtin_popcount (mask); return __builtin_popcount (mask);
#else #else
unsigned int i, sum = 0; unsigned int i;
int sum = 0;
for (i = 0; i < 8 * sizeof (mask); i++) for (i = 0; i < 8 * sizeof (mask); i++)
{ {
@ -8496,7 +8497,7 @@ stm32l4xx_need_create_replacing_stub (const insn32 insn,
/* The field encoding the register list is the same for both LDMIA /* The field encoding the register list is the same for both LDMIA
and LDMDB encodings. */ and LDMDB encodings. */
if (is_thumb2_ldmia (insn) || is_thumb2_ldmdb (insn)) if (is_thumb2_ldmia (insn) || is_thumb2_ldmdb (insn))
nb_words = popcount (insn & 0x0000ffff); nb_words = elf32_arm_popcount (insn & 0x0000ffff);
else if (is_thumb2_vldm (insn)) else if (is_thumb2_vldm (insn))
nb_words = (insn & 0xff); nb_words = (insn & 0xff);
@ -17903,7 +17904,7 @@ stm32l4xx_create_replacing_stub_ldmia (struct elf32_arm_link_hash_table * htab,
int insn_all_registers = initial_insn & 0x0000ffff; int insn_all_registers = initial_insn & 0x0000ffff;
int insn_low_registers, insn_high_registers; int insn_low_registers, insn_high_registers;
int usable_register_mask; int usable_register_mask;
int nb_registers = popcount (insn_all_registers); int nb_registers = elf32_arm_popcount (insn_all_registers);
int restore_pc = (insn_all_registers & (1 << 15)) ? 1 : 0; int restore_pc = (insn_all_registers & (1 << 15)) ? 1 : 0;
int restore_rn = (insn_all_registers & (1 << rn)) ? 1 : 0; int restore_rn = (insn_all_registers & (1 << rn)) ? 1 : 0;
bfd_byte *current_stub_contents = base_stub_contents; bfd_byte *current_stub_contents = base_stub_contents;
@ -17947,7 +17948,7 @@ stm32l4xx_create_replacing_stub_ldmia (struct elf32_arm_link_hash_table * htab,
BFD_ASSERT (!wback || !restore_rn); BFD_ASSERT (!wback || !restore_rn);
/* - nb_registers > 8. */ /* - nb_registers > 8. */
BFD_ASSERT (popcount (insn_all_registers) > 8); BFD_ASSERT (elf32_arm_popcount (insn_all_registers) > 8);
/* At this point, LDMxx initial insn loads between 9 and 14 registers. */ /* At this point, LDMxx initial insn loads between 9 and 14 registers. */
@ -18049,7 +18050,7 @@ stm32l4xx_create_replacing_stub_ldmdb (struct elf32_arm_link_hash_table * htab,
int usable_register_mask; int usable_register_mask;
int restore_pc = (insn_all_registers & (1 << 15)) ? 1 : 0; int restore_pc = (insn_all_registers & (1 << 15)) ? 1 : 0;
int restore_rn = (insn_all_registers & (1 << rn)) ? 1 : 0; int restore_rn = (insn_all_registers & (1 << rn)) ? 1 : 0;
int nb_registers = popcount (insn_all_registers); int nb_registers = elf32_arm_popcount (insn_all_registers);
bfd_byte *current_stub_contents = base_stub_contents; bfd_byte *current_stub_contents = base_stub_contents;
BFD_ASSERT (is_thumb2_ldmdb (initial_insn)); BFD_ASSERT (is_thumb2_ldmdb (initial_insn));
@ -18090,7 +18091,7 @@ stm32l4xx_create_replacing_stub_ldmdb (struct elf32_arm_link_hash_table * htab,
BFD_ASSERT (!wback || !restore_rn); BFD_ASSERT (!wback || !restore_rn);
/* - nb_registers > 8. */ /* - nb_registers > 8. */
BFD_ASSERT (popcount (insn_all_registers) > 8); BFD_ASSERT (elf32_arm_popcount (insn_all_registers) > 8);
/* At this point, LDMxx initial insn loads between 9 and 14 registers. */ /* At this point, LDMxx initial insn loads between 9 and 14 registers. */