section tdata tidy
Alan Modra
amodra@gmail.com
Mon Dec 16 10:52:46 GMT 2024
Any _new_section_hook that is not itself called from another
_new_section_hook will always see used_by_bfd NULL. Remove those
NULL checks in such hooks, and tidy code a little.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 17df8b30eb6..a4c23216c68 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -18535,16 +18535,10 @@ elf32_arm_filter_implib_symbols (bfd *abfd ATTRIBUTE_UNUSED,
static bool
elf32_arm_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- _arm_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
-
- sdata = (_arm_elf_section_data *) bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ _arm_elf_section_data *sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
index 20e03bd7588..12b68ba63f3 100644
--- a/bfd/elf32-avr.c
+++ b/bfd/elf32-avr.c
@@ -764,16 +764,12 @@ struct elf_avr_section_data
static bool
elf_avr_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct elf_avr_section_data *sdata;
- size_t amt = sizeof (*sdata);
+ struct elf_avr_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index ce2064a75df..b500242c9cf 100644
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -742,16 +742,12 @@ struct _microblaze_elf_section_data
static bool
microblaze_elf_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct _microblaze_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
+ struct _microblaze_elf_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c
index a3e22c3e564..30d6dc85e22 100644
--- a/bfd/elf32-score.c
+++ b/bfd/elf32-score.c
@@ -4056,9 +4056,8 @@ static bool
s3_elf32_score_new_section_hook (bfd *abfd, asection *sec)
{
struct _score_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
- sdata = bfd_zalloc (abfd, amt);
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
if (sdata == NULL)
return false;
sec->used_by_bfd = sdata;
diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c
index c9edf2b1a48..4a4cec1f16a 100644
--- a/bfd/elf32-score7.c
+++ b/bfd/elf32-score7.c
@@ -3863,9 +3863,8 @@ bool
s7_elf32_score_new_section_hook (bfd *abfd, asection *sec)
{
struct _score_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
- sdata = bfd_zalloc (abfd, amt);
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
if (sdata == NULL)
return false;
sec->used_by_bfd = sdata;
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index 881d4d8eb97..f65a0081202 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -247,15 +247,12 @@ spu_elf_rel9 (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
static bool
spu_elf_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct _spu_elf_section_data *sdata;
+ struct _spu_elf_section_data *sdata;
- sdata = bfd_zalloc (abfd, sizeof (*sdata));
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 5c00318cd15..dee75276d66 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -2083,18 +2083,12 @@ static bool
elf32_tic6x_new_section_hook (bfd *abfd, asection *sec)
{
bool ret;
+ _tic6x_elf_section_data *sdata;
- /* Allocate target specific section data. */
- if (!sec->used_by_bfd)
- {
- _tic6x_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
-
- sdata = (_tic6x_elf_section_data *) bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
ret = _bfd_elf_new_section_hook (abfd, sec);
sec->use_rela_p = elf32_tic6x_tdata (abfd)->use_rela_p;
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 58f79e55529..9682438f76a 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -6101,16 +6101,12 @@ struct elf_xtensa_section_data
static bool
elf_xtensa_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct elf_xtensa_section_data *sdata;
- size_t amt = sizeof (*sdata);
+ struct elf_xtensa_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
index 56c7361d32d..43a46e52c5b 100644
--- a/bfd/elf64-mmix.c
+++ b/bfd/elf64-mmix.c
@@ -828,16 +828,12 @@ bfd_elf64_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
static bool
mmix_elf_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct _mmix_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
+ struct _mmix_elf_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index dd1ee1eb9ea..f9964fa93d0 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -2050,16 +2050,12 @@ struct _ppc64_elf_section_data
static bool
ppc64_elf_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct _ppc64_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
+ struct _ppc64_elf_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 701191470dc..c4077d5ba9a 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -8749,18 +8749,13 @@ elfNN_aarch64_output_arch_local_syms (bfd *output_bfd,
static bool
elfNN_aarch64_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- _aarch64_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
-
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ _aarch64_elf_section_data *sdata;
record_section_with_aarch64_elf_section_data (sec);
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elfnn-kvx.c b/bfd/elfnn-kvx.c
index 516ce2fb988..e2953199889 100644
--- a/bfd/elfnn-kvx.c
+++ b/bfd/elfnn-kvx.c
@@ -3688,16 +3688,12 @@ elfNN_kvx_output_arch_local_syms (bfd *output_bfd,
static bool
elfNN_kvx_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- _kvx_elf_section_data *sdata;
- bfd_size_type amt = sizeof (*sdata);
+ _kvx_elf_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
index 2ce5f73ae80..e3d39163d94 100644
--- a/bfd/elfnn-loongarch.c
+++ b/bfd/elfnn-loongarch.c
@@ -152,16 +152,12 @@ struct loongarch_elf_section_data
static bool
loongarch_elf_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct loongarch_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
+ struct loongarch_elf_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (!sdata)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (!sdata)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index c9895aa660f..459c98e23d7 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -1412,16 +1412,12 @@ _bfd_mips_elf_free_cached_info (bfd *abfd)
bool
_bfd_mips_elf_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct _mips_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
+ struct _mips_elf_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index 4ab3ab842d5..3f642aefd63 100644
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -2660,16 +2660,12 @@ _bfd_sparc_elf_late_size_sections (bfd *output_bfd,
bool
_bfd_sparc_elf_new_section_hook (bfd *abfd, asection *sec)
{
- if (!sec->used_by_bfd)
- {
- struct _bfd_sparc_elf_section_data *sdata;
- size_t amt = sizeof (*sdata);
+ struct _bfd_sparc_elf_section_data *sdata;
- sdata = bfd_zalloc (abfd, amt);
- if (sdata == NULL)
- return false;
- sec->used_by_bfd = sdata;
- }
+ sdata = bfd_zalloc (abfd, sizeof (*sdata));
+ if (sdata == NULL)
+ return false;
+ sec->used_by_bfd = sdata;
return _bfd_elf_new_section_hook (abfd, sec);
}
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 95bb4818043..9ec5cabc021 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -3520,40 +3520,31 @@ bfd_mach_o_read_header (bfd *abfd, file_ptr hdr_off, bfd_mach_o_header *header)
bool
bfd_mach_o_new_section_hook (bfd *abfd, asection *sec)
{
- bfd_mach_o_section *s;
- unsigned bfdalign = bfd_section_alignment (sec);
-
- s = bfd_mach_o_get_mach_o_section (sec);
+ bfd_mach_o_section *s = bfd_zalloc (abfd, sizeof (*s));
if (s == NULL)
- {
- flagword bfd_flags;
- static const mach_o_section_name_xlat * xlat;
-
- s = (bfd_mach_o_section *) bfd_zalloc (abfd, sizeof (*s));
- if (s == NULL)
- return false;
- sec->used_by_bfd = s;
- s->bfdsection = sec;
-
- /* Create the Darwin seg/sect name pair from the bfd name.
- If this is a canonical name for which a specific paiting exists
- there will also be defined flags, type, attribute and alignment
- values. */
- xlat = bfd_mach_o_convert_section_name_to_mach_o (abfd, sec, s);
- if (xlat != NULL)
- {
- s->flags = xlat->macho_sectype | xlat->macho_secattr;
- s->align = xlat->sectalign > bfdalign ? xlat->sectalign
- : bfdalign;
- bfd_set_section_alignment (sec, s->align);
- bfd_flags = bfd_section_flags (sec);
- if (bfd_flags == SEC_NO_FLAGS)
- bfd_set_section_flags (sec, xlat->bfd_flags);
- }
- else
- /* Create default flags. */
- bfd_mach_o_set_section_flags_from_bfd (abfd, sec);
+ return false;
+ sec->used_by_bfd = s;
+ s->bfdsection = sec;
+
+ /* Create the Darwin seg/sect name pair from the bfd name.
+ If this is a canonical name for which a specific paiting exists
+ there will also be defined flags, type, attribute and alignment
+ values. */
+ const mach_o_section_name_xlat *xlat
+ = bfd_mach_o_convert_section_name_to_mach_o (abfd, sec, s);
+ if (xlat != NULL)
+ {
+ s->flags = xlat->macho_sectype | xlat->macho_secattr;
+ unsigned bfdalign = bfd_section_alignment (sec);
+ s->align = xlat->sectalign > bfdalign ? xlat->sectalign : bfdalign;
+ bfd_set_section_alignment (sec, s->align);
+ flagword bfd_flags = bfd_section_flags (sec);
+ if (bfd_flags == SEC_NO_FLAGS)
+ bfd_set_section_flags (sec, xlat->bfd_flags);
}
+ else
+ /* Create default flags. */
+ bfd_mach_o_set_section_flags_from_bfd (abfd, sec);
return _bfd_generic_new_section_hook (abfd, sec);
}
diff --git a/bfd/mmo.c b/bfd/mmo.c
index 6704bc27d6b..a19951040b1 100644
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -2129,15 +2129,12 @@ mmo_scan (bfd *abfd)
static bool
mmo_new_section_hook (bfd *abfd, asection *newsect)
{
+ /* We zero-fill all fields and assume NULL is represented by an all
+ zero-bit pattern. */
+ newsect->used_by_bfd
+ = bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct));
if (!newsect->used_by_bfd)
- {
- /* We zero-fill all fields and assume NULL is represented by an all
- zero-bit pattern. */
- newsect->used_by_bfd
- = bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct));
- if (!newsect->used_by_bfd)
- return false;
- }
+ return false;
/* Always align to at least 32-bit words. */
newsect->alignment_power = 2;
diff --git a/bfd/som.c b/bfd/som.c
index 86f7f4121e4..171dbc4a393 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -5328,14 +5328,12 @@ extern const bfd_target hppa_som_vec;
static bool
som_new_section_hook (bfd *abfd, asection *newsect)
{
+ size_t amt = sizeof (struct som_section_data_struct);
+
+ newsect->used_by_bfd = bfd_zalloc (abfd, amt);
if (!newsect->used_by_bfd)
- {
- size_t amt = sizeof (struct som_section_data_struct);
+ return false;
- newsect->used_by_bfd = bfd_zalloc (abfd, amt);
- if (!newsect->used_by_bfd)
- return false;
- }
newsect->alignment_power = 3;
/* We allow more than three sections internally. */
--
Alan Modra
More information about the Binutils
mailing list