From 34ca55313b8e6c0f6354f2dc5a3a35e38c32ae82 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Tue, 14 Apr 2020 15:21:50 +0100 Subject: [PATCH] The assembler only supports 32-bit stabs. So set sh_entsize unconditionally to 12. PR gas/25768 * elf.c (assign_section_numbers): Always set .stab sh_entsize to 12. --- bfd/ChangeLog | 6 ++++++ bfd/elf.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0ef3b2faefd..b89aced0e7e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2020-04-14 Fangrui Song + + PR gas/25768 + * elf.c (assign_section_numbers): Always set .stab sh_entsize to + 12. + 2020-04-14 Stephen Casner PR ld/25677 diff --git a/bfd/elf.c b/bfd/elf.c index 1780074f5ab..3d2eee9ea8b 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -3998,9 +3998,7 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info) elf_section_data (s)->this_hdr.sh_link = d->this_idx; /* This is a .stab section. */ - if (elf_section_data (s)->this_hdr.sh_entsize == 0) - elf_section_data (s)->this_hdr.sh_entsize - = 4 + 2 * bfd_get_arch_size (abfd) / 8; + elf_section_data (s)->this_hdr.sh_entsize = 12; } } break; -- 2.30.2