From 3a574cce26ee7dca6d6cd4c756dec57a5c0b9c99 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 22 Feb 2023 17:37:26 +1030 Subject: [PATCH] Test SEC_HAS_CONTENTS in relax routines More places that generally expect instructions, so not zeros. * coff-sh.c (sh_relax_section, sh_relax_delete_bytes): Exclude sections without SEC_HAS_CONTENTS set. * elf-m10200.c (mn10200_elf_relax_section): Likewise. * elf32-arc.c (arc_elf_relax_section): Likewise. * elf32-avr.c (elf32_avr_relax_section): Likewise. * elf32-cr16.c (elf32_cr16_relax_section): Likewise. * elf32-crx.c (elf32_crx_relax_section): Likewise. * elf32-epiphany.c (epiphany_elf_relax_section): Likewise. * elf32-ft32.c (ft32_elf_relax_section): Likewise. * elf32-h8300.c (elf32_h8_relax_section): Likewise. * elf32-ip2k.c (ip2k_elf_relax_section): Likewise. * elf32-m32c.c (m32c_elf_relax_section): Likewise. * elf32-m68hc11.c (m68hc11_elf_relax_section): Likewise. * elf32-msp430.c (msp430_elf_relax_section): Likewise. * elf32-pru.c (pru_elf32_relax_section): Likewise. * elf32-rl78.c (rl78_elf_relax_section): Likewise. * elf32-rx.c (elf32_rx_relax_section): Likewise. * elf32-sh.c (sh_elf_relax_section): Likewise. (sh_elf_relax_delete_bytes): Likewise. * elf32-v850.c (v850_elf_relax_section): Likewise. * elf64-alpha.c (elf64_alpha_relax_section): Likewise. * elf64-ia64-vms.c (elf64_ia64_relax_section): Likewise. * elfnn-ia64.c (elfNN_ia64_relax_section): Likewise. * elfnn-riscv.c (_bfd_riscv_relax_section): Likewise. * elfxx-mips.c (_bfd_mips_elf_relax_section): Likewise. --- bfd/coff-sh.c | 2 ++ bfd/elf-m10200.c | 3 ++- bfd/elf32-arc.c | 3 ++- bfd/elf32-avr.c | 3 ++- bfd/elf32-cr16.c | 3 ++- bfd/elf32-crx.c | 3 ++- bfd/elf32-epiphany.c | 3 ++- bfd/elf32-ft32.c | 3 ++- bfd/elf32-h8300.c | 3 ++- bfd/elf32-ip2k.c | 3 ++- bfd/elf32-m32c.c | 3 ++- bfd/elf32-m68hc11.c | 3 ++- bfd/elf32-msp430.c | 6 ++++-- bfd/elf32-pru.c | 6 ++++-- bfd/elf32-rl78.c | 3 ++- bfd/elf32-rx.c | 3 ++- bfd/elf32-sh.c | 2 ++ bfd/elf32-v850.c | 1 + bfd/elf64-alpha.c | 4 ++-- bfd/elf64-ia64-vms.c | 5 +++-- bfd/elfnn-ia64.c | 5 +++-- bfd/elfnn-riscv.c | 3 ++- bfd/elfxx-mips.c | 3 ++- 23 files changed, 51 insertions(+), 25 deletions(-) diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c index 314b796ac8b..50e9043993b 100644 --- a/bfd/coff-sh.c +++ b/bfd/coff-sh.c @@ -717,6 +717,7 @@ sh_relax_section (bfd *abfd, *again = false; if (bfd_link_relocatable (link_info) + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0) return true; @@ -1364,6 +1365,7 @@ sh_relax_delete_bytes (bfd *abfd, bfd_byte *ocontents; if (o == sec + || (o->flags & SEC_HAS_CONTENTS) == 0 || (o->flags & SEC_RELOC) == 0 || o->reloc_count == 0) continue; diff --git a/bfd/elf-m10200.c b/bfd/elf-m10200.c index 24be1cb4d20..d7376cb2cf6 100644 --- a/bfd/elf-m10200.c +++ b/bfd/elf-m10200.c @@ -577,8 +577,9 @@ mn10200_elf_relax_section (bfd *abfd, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c index c5331ed8a61..78dfd6eebbd 100644 --- a/bfd/elf32-arc.c +++ b/bfd/elf32-arc.c @@ -2972,8 +2972,9 @@ arc_elf_relax_section (bfd *abfd, asection *sec, section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c index c01355ac5b7..702719136d0 100644 --- a/bfd/elf32-avr.c +++ b/bfd/elf32-avr.c @@ -2522,8 +2522,9 @@ elf32_avr_relax_section (bfd *abfd, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c index 32507dabe3f..caaf3bdbfe0 100644 --- a/bfd/elf32-cr16.c +++ b/bfd/elf32-cr16.c @@ -1718,8 +1718,9 @@ elf32_cr16_relax_section (bfd *abfd, asection *sec, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-crx.c b/bfd/elf32-crx.c index f041e4828ef..811440d124a 100644 --- a/bfd/elf32-crx.c +++ b/bfd/elf32-crx.c @@ -973,8 +973,9 @@ elf32_crx_relax_section (bfd *abfd, asection *sec, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-epiphany.c b/bfd/elf32-epiphany.c index f05ef1497fa..da874dadd0b 100644 --- a/bfd/elf32-epiphany.c +++ b/bfd/elf32-epiphany.c @@ -213,8 +213,9 @@ epiphany_elf_relax_section (bfd *abfd, asection *sec, if this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-ft32.c b/bfd/elf32-ft32.c index 07036b3b140..ce4946aef27 100644 --- a/bfd/elf32-ft32.c +++ b/bfd/elf32-ft32.c @@ -1092,8 +1092,9 @@ ft32_elf_relax_section (bfd *abfd, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-h8300.c b/bfd/elf32-h8300.c index f08ab3f52ed..3039b824fa5 100644 --- a/bfd/elf32-h8300.c +++ b/bfd/elf32-h8300.c @@ -706,8 +706,9 @@ elf32_h8_relax_section (bfd *abfd, asection *sec, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-ip2k.c b/bfd/elf32-ip2k.c index 5f63d910c4d..cb1ab0e12e5 100644 --- a/bfd/elf32-ip2k.c +++ b/bfd/elf32-ip2k.c @@ -1096,8 +1096,9 @@ ip2k_elf_relax_section (bfd *abfd, if this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c index e9308ff8684..129d6a92c02 100644 --- a/bfd/elf32-m32c.c +++ b/bfd/elf32-m32c.c @@ -1459,8 +1459,9 @@ m32c_elf_relax_section (bfd *abfd, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c index 11a58f02298..67a8dad0965 100644 --- a/bfd/elf32-m68hc11.c +++ b/bfd/elf32-m68hc11.c @@ -709,8 +709,9 @@ m68hc11_elf_relax_section (bfd *abfd, asection *sec, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c index 4475bafe8c2..e77ca392fe3 100644 --- a/bfd/elf32-msp430.c +++ b/bfd/elf32-msp430.c @@ -2014,8 +2014,10 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 - || sec->reloc_count == 0 || (sec->flags & SEC_CODE) == 0) + || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 + || (sec->flags & SEC_CODE) == 0) return true; if (debug_relocs) diff --git a/bfd/elf32-pru.c b/bfd/elf32-pru.c index d7bbbe18830..2bb4cb7a8cd 100644 --- a/bfd/elf32-pru.c +++ b/bfd/elf32-pru.c @@ -1354,8 +1354,10 @@ pru_elf32_relax_section (bfd *abfd, asection *sec, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 - || sec->reloc_count == 0 || (sec->flags & SEC_CODE) == 0) + || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 + || (sec->flags & SEC_CODE) == 0) return true; symtab_hdr = & elf_tdata (abfd)->symtab_hdr; diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c index 6adc495115f..c7a94f2a280 100644 --- a/bfd/elf32-rl78.c +++ b/bfd/elf32-rl78.c @@ -2106,8 +2106,9 @@ rl78_elf_relax_section (bfd *abfd, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c index e3dde13fea4..d14c23831bd 100644 --- a/bfd/elf32-rx.c +++ b/bfd/elf32-rx.c @@ -2038,8 +2038,9 @@ elf32_rx_relax_section (bfd *abfd, this section does not have relocs, or if this is not a code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 246f9f56188..fdcc5870890 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -468,6 +468,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec, *again = false; if (bfd_link_relocatable (link_info) + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0) return true; @@ -1154,6 +1155,7 @@ sh_elf_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, bfd_byte *ocontents; if (o == sec + || (o->flags & SEC_HAS_CONTENTS) == 0 || (o->flags & SEC_RELOC) == 0 || o->reloc_count == 0) continue; diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c index 681526c20c9..4ce54990e30 100644 --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -3440,6 +3440,7 @@ v850_elf_relax_section (bfd *abfd, *again = false; if (bfd_link_relocatable (link_info) + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0) return true; diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index 875bf69519a..81d58c8cbc1 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -3726,8 +3726,8 @@ elf64_alpha_relax_section (bfd *abfd, asection *sec, *again = false; if (bfd_link_relocatable (link_info) - || ((sec->flags & (SEC_CODE | SEC_RELOC | SEC_ALLOC)) - != (SEC_CODE | SEC_RELOC | SEC_ALLOC)) + || ((sec->flags & (SEC_CODE | SEC_RELOC | SEC_ALLOC | SEC_HAS_CONTENTS)) + != (SEC_CODE | SEC_RELOC | SEC_ALLOC | SEC_HAS_CONTENTS)) || sec->reloc_count == 0) return true; diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c index 9fb1a93bf67..1866a5798fa 100644 --- a/bfd/elf64-ia64-vms.c +++ b/bfd/elf64-ia64-vms.c @@ -370,8 +370,9 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec, /* Nothing to do if there are no relocations or there is no need for the current pass. */ - if ((sec->flags & SEC_RELOC) == 0 - || sec->reloc_count == 0 + if (sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (link_info->relax_pass == 0 && sec->skip_relax_pass_0) || (link_info->relax_pass == 1 && sec->skip_relax_pass_1)) return true; diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c index c1f49bd07d6..a2d60e7e67f 100644 --- a/bfd/elfnn-ia64.c +++ b/bfd/elfnn-ia64.c @@ -370,8 +370,9 @@ elfNN_ia64_relax_section (bfd *abfd, asection *sec, /* Nothing to do if there are no relocations or there is no need for the current pass. */ - if ((sec->flags & SEC_RELOC) == 0 - || sec->reloc_count == 0 + if (sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (link_info->relax_pass == 0 && sec->skip_relax_pass_0) || (link_info->relax_pass == 1 && sec->skip_relax_pass_1)) return true; diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index c2604de0050..355ddb22566 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -4776,8 +4776,9 @@ _bfd_riscv_relax_section (bfd *abfd, asection *sec, if (bfd_link_relocatable (info) || sec->sec_flg0 - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (info->disable_target_specific_optimizations && info->relax_pass == 0) /* The exp_seg_relro_adjust is enum phase_enum (0x4), diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 5b66cb81c1b..74a4d0d382b 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -13975,8 +13975,9 @@ _bfd_mips_elf_relax_section (bfd *abfd, asection *sec, code section. */ if (bfd_link_relocatable (link_info) - || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 + || (sec->flags & SEC_RELOC) == 0 + || (sec->flags & SEC_HAS_CONTENTS) == 0 || (sec->flags & SEC_CODE) == 0) return true; -- 2.30.2