diff options
author | Alan Modra <amodra@gmail.com> | 2021-03-31 10:30:54 +1030 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2021-03-31 10:49:23 +1030 |
commit | 0a1b45a20eaa98d4d9026dc1fd17e79e741183af (patch) | |
tree | 059b2b296b4d60784a82cd6a52dae47dcac4d66a /bfd/merge.c | |
parent | faa7a26040c617a6d29f601998b99a1da882c672 (diff) | |
download | gdb-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.zip gdb-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.tar.gz gdb-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.tar.bz2 |
Use bool in bfd
* sysdep.h: POISON_BFD_BOOLEAN: Define.
* aix5ppc-core.c, * aout-cris.c, * aout-ns32k.c, * aout-target.h,
* aoutx.h, * arc-got.h, * archive.c, * archive64.c, * archures.c,
* bfd-in.h, * bfd.c, * bfdwin.c, * binary.c, * cache.c,
* coff-alpha.c, * coff-arm.c, * coff-arm.h, * coff-bfd.c,
* coff-bfd.h, * coff-go32.c, * coff-i386.c, * coff-ia64.c,
* coff-mcore.c, * coff-mips.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic30.c, * coff-tic4x.c, * coff-tic54x.c,
* coff-x86_64.c, * coff-z80.c, * coff-z8k.c, * coff64-rs6000.c,
* coffcode.h, * coffgen.c, * cofflink.c, * compress.c,
* corefile.c, * cpu-aarch64.c, * cpu-aarch64.h, * cpu-alpha.c,
* cpu-arc.c, * cpu-arm.c, * cpu-arm.h, * cpu-avr.c, * cpu-bfin.c,
* cpu-bpf.c, * cpu-cr16.c, * cpu-cris.c, * cpu-crx.c,
* cpu-csky.c, * cpu-d10v.c, * cpu-d30v.c, * cpu-dlx.c,
* cpu-epiphany.c, * cpu-fr30.c, * cpu-frv.c, * cpu-ft32.c,
* cpu-h8300.c, * cpu-hppa.c, * cpu-i386.c, * cpu-ia64.c,
* cpu-iamcu.c, * cpu-ip2k.c, * cpu-iq2000.c, * cpu-k1om.c,
* cpu-l1om.c, * cpu-lm32.c, * cpu-m10200.c, * cpu-m10300.c,
* cpu-m32c.c, * cpu-m32r.c, * cpu-m68hc11.c, * cpu-m68hc12.c,
* cpu-m68k.c, * cpu-m9s12x.c, * cpu-m9s12xg.c, * cpu-mcore.c,
* cpu-mep.c, * cpu-metag.c, * cpu-microblaze.c, * cpu-mips.c,
* cpu-mmix.c, * cpu-moxie.c, * cpu-msp430.c, * cpu-mt.c,
* cpu-nds32.c, * cpu-nfp.c, * cpu-nios2.c, * cpu-ns32k.c,
* cpu-or1k.c, * cpu-pdp11.c, * cpu-pj.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-riscv.c, * cpu-rl78.c, * cpu-rs6000.c,
* cpu-rx.c, * cpu-s12z.c, * cpu-s390.c, * cpu-score.c,
* cpu-sh.c, * cpu-sparc.c, * cpu-spu.c, * cpu-tic30.c,
* cpu-tic4x.c, * cpu-tic54x.c, * cpu-tic6x.c, * cpu-tilegx.c,
* cpu-tilepro.c, * cpu-v850.c, * cpu-v850_rh850.c, * cpu-vax.c,
* cpu-visium.c, * cpu-wasm32.c, * cpu-xc16x.c, * cpu-xgate.c,
* cpu-xstormy16.c, * cpu-xtensa.c, * cpu-z80.c, * cpu-z8k.c,
* dwarf1.c, * dwarf2.c, * ecoff-bfd.h, * ecoff.c, * ecofflink.c,
* elf-attrs.c, * elf-bfd.h, * elf-eh-frame.c, * elf-hppa.h,
* elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-nacl.c,
* elf-nacl.h, * elf-properties.c, * elf-s390-common.c,
* elf-s390.h, * elf-strtab.c, * elf-vxworks.c, * elf-vxworks.h,
* elf.c, * elf32-am33lin.c, * elf32-arc.c, * elf32-arm.c,
* elf32-arm.h, * elf32-avr.c, * elf32-avr.h, * elf32-bfin.c,
* elf32-bfin.h, * elf32-cr16.c, * elf32-cr16.h, * elf32-cris.c,
* elf32-crx.c, * elf32-csky.c, * elf32-csky.h, * elf32-d10v.c,
* elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
* elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c, * elf32-gen.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-hppa.h, * elf32-i386.c,
* elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
* elf32-m68hc1x.c, * elf32-m68hc1x.h, * elf32-m68k.c,
* elf32-m68k.h, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c,
* elf32-metag.h, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nios2.c, * elf32-nios2.h, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s12z.c, * elf32-s390.c, * elf32-score.c,
* elf32-score.h, * elf32-score7.c, * elf32-sh-relocs.h,
* elf32-sh.c, * elf32-sparc.c, * elf32-spu.c, * elf32-spu.h,
* elf32-tic6x.c, * elf32-tic6x.h, * elf32-tilegx.c,
* elf32-tilepro.c, * elf32-v850.c, * elf32-v850.h,
* elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c,
* elf32-xc16x.c, * elf32-xgate.c, * elf32-xstormy16.c,
* elf32-xtensa.c, * elf32-z80.c, * elf64-alpha.c, * elf64-bpf.c,
* elf64-gen.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mips.c, * elf64-mmix.c, * elf64-nfp.c, * elf64-ppc.c,
* elf64-ppc.h, * elf64-s390.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-x86-64.c, * elfcode.h,
* elfcore.h, * elflink.c, * elfn32-mips.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-aarch64.c,
* elfxx-aarch64.h, * elfxx-ia64.c, * elfxx-ia64.h,
* elfxx-mips.c, * elfxx-mips.h, * elfxx-riscv.c, * elfxx-riscv.h,
* elfxx-sparc.c, * elfxx-sparc.h, * elfxx-target.h,
* elfxx-tilegx.c, * elfxx-tilegx.h, * elfxx-x86.c, * elfxx-x86.h,
* format.c, * genlink.h, * hash.c, * i386aout.c, * i386lynx.c,
* i386msdos.c, * ihex.c, * libaout.h, * libbfd-in.h,
* libbfd.c, * libcoff-in.h, * libecoff.h, * libpei.h,
* libxcoff.h, * linker.c, * mach-o-aarch64.c, * mach-o-arm.c,
* mach-o-i386.c, * mach-o-x86-64.c, * mach-o.c, * mach-o.h,
* merge.c, * mmo.c, * netbsd.h, * opncls.c, * pc532-mach.c,
* pdp11.c, * pe-arm.c, * pe-i386.c, * pe-mcore.c, * pe-sh.c,
* pe-x86_64.c, * peXXigen.c, * pef.c, * pei-arm.c, * pei-i386.c,
* pei-ia64.c, * pei-mcore.c, * pei-sh.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * plugin.h, * ppcboot.c, * reloc.c,
* reloc16.c, * rs6000-core.c, * section.c, * simple.c, * som.c,
* som.h, * srec.c, * stabs.c, * syms.c, * targets.c, * tekhex.c,
* verilog.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c, * vms.h,
* wasm-module.c, * xcofflink.c, * xcofflink.h, * xsym.c,
* xsym.h: Replace bfd_boolean with bool, FALSE with false, and
TRUE with true throughout.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
Diffstat (limited to 'bfd/merge.c')
-rw-r--r-- | bfd/merge.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/bfd/merge.c b/bfd/merge.c index fd5971c..b7a895d 100644 --- a/bfd/merge.c +++ b/bfd/merge.c @@ -70,7 +70,7 @@ struct sec_merge_hash /* Entity size. */ unsigned int entsize; /* Are entries fixed size or zero terminated strings? */ - bfd_boolean strings; + bool strings; }; struct sec_merge_info @@ -135,7 +135,7 @@ sec_merge_hash_newfunc (struct bfd_hash_entry *entry, static struct sec_merge_hash_entry * sec_merge_hash_lookup (struct sec_merge_hash *table, const char *string, - unsigned int alignment, bfd_boolean create) + unsigned int alignment, bool create) { const unsigned char *s; unsigned long hash; @@ -233,7 +233,7 @@ sec_merge_hash_lookup (struct sec_merge_hash *table, const char *string, /* Create a new hash table. */ static struct sec_merge_hash * -sec_merge_init (unsigned int entsize, bfd_boolean strings) +sec_merge_init (unsigned int entsize, bool strings) { struct sec_merge_hash *table; @@ -266,7 +266,7 @@ sec_merge_add (struct sec_merge_hash *tab, const char *str, { struct sec_merge_hash_entry *entry; - entry = sec_merge_hash_lookup (tab, str, alignment, TRUE); + entry = sec_merge_hash_lookup (tab, str, alignment, true); if (entry == NULL) return NULL; @@ -284,7 +284,7 @@ sec_merge_add (struct sec_merge_hash *tab, const char *str, return entry; } -static bfd_boolean +static bool sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry, unsigned char *contents, file_ptr offset) { @@ -302,7 +302,7 @@ sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry, pad = (char *) bfd_zmalloc (pad_len); if (pad == NULL) - return FALSE; + return false; for (; entry != NULL && entry->secinfo == secinfo; entry = entry->next) { @@ -349,17 +349,17 @@ sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry, } free (pad); - return TRUE; + return true; err: free (pad); - return FALSE; + return false; } /* Register a SEC_MERGE section as a candidate for merging. This function is called for all non-dynamic SEC_MERGE input sections. */ -bfd_boolean +bool _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec, void **psecinfo) { @@ -378,15 +378,15 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec, if (sec->size == 0 || (sec->flags & SEC_EXCLUDE) != 0 || sec->entsize == 0) - return TRUE; + return true; if (sec->size % sec->entsize != 0) - return TRUE; + return true; if ((sec->flags & SEC_RELOC) != 0) { /* We aren't prepared to handle relocations in merged sections. */ - return TRUE; + return true; } #ifndef CHAR_BIT @@ -394,7 +394,7 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec, #endif alignment_power = sec->alignment_power * opb; if (alignment_power >= sizeof (align) * CHAR_BIT) - return TRUE; + return true; align = 1u << alignment_power; if ((sec->entsize < align @@ -409,7 +409,7 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec, of alignment. For non-string constants, alignment must be smaller than or equal to entity size and entity size must be integer multiple of alignment. */ - return TRUE; + return true; } for (sinfo = (struct sec_merge_info *) *psinfo; sinfo; sinfo = sinfo->next) @@ -468,28 +468,28 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec, if (! bfd_get_full_section_contents (sec->owner, sec, &contents)) goto error_return; - return TRUE; + return true; error_return: *psecinfo = NULL; - return FALSE; + return false; } /* Record one section into the hash table. */ -static bfd_boolean +static bool record_section (struct sec_merge_info *sinfo, struct sec_merge_sec_info *secinfo) { asection *sec = secinfo->sec; struct sec_merge_hash_entry *entry; - bfd_boolean nul; + bool nul; unsigned char *p, *end; bfd_vma mask, eltalign; unsigned int align, i; align = sec->alignment_power; end = secinfo->contents + sec->size; - nul = FALSE; + nul = false; mask = ((bfd_vma) 1 << align) - 1; if (sec->flags & SEC_STRINGS) { @@ -510,7 +510,7 @@ record_section (struct sec_merge_info *sinfo, { if (!nul && !((p - secinfo->contents) & mask)) { - nul = TRUE; + nul = true; entry = sec_merge_add (sinfo->htab, "", (unsigned) mask + 1, secinfo); if (! entry) @@ -530,7 +530,7 @@ record_section (struct sec_merge_info *sinfo, break; if (!nul && !((p - secinfo->contents) & mask)) { - nul = TRUE; + nul = true; entry = sec_merge_add (sinfo->htab, (char *) p, (unsigned) mask + 1, secinfo); if (! entry) @@ -551,12 +551,12 @@ record_section (struct sec_merge_info *sinfo, } } - return TRUE; + return true; error_return: for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next) *secinfo->psecinfo = NULL; - return FALSE; + return false; } /* qsort comparison function. Won't ever return zero as all entries @@ -732,7 +732,7 @@ merge_strings (struct sec_merge_info *sinfo) /* This function is called once after all SEC_MERGE sections are registered with _bfd_merge_section. */ -bfd_boolean +bool _bfd_merge_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED, void *xsinfo, @@ -765,7 +765,7 @@ _bfd_merge_sections (bfd *abfd, else { if (!record_section (sinfo, secinfo)) - return FALSE; + return false; if (align) { unsigned int opb = bfd_octets_per_byte (abfd, secinfo->sec); @@ -783,7 +783,7 @@ _bfd_merge_sections (bfd *abfd, { secinfo = merge_strings (sinfo); if (!secinfo) - return FALSE; + return false; } else { @@ -822,12 +822,12 @@ _bfd_merge_sections (bfd *abfd, secinfo->sec->flags |= SEC_EXCLUDE | SEC_KEEP; } - return TRUE; + return true; } /* Write out the merged section. */ -bfd_boolean +bool _bfd_write_merged_section (bfd *output_bfd, asection *sec, void *psecinfo) { struct sec_merge_sec_info *secinfo; @@ -838,10 +838,10 @@ _bfd_write_merged_section (bfd *output_bfd, asection *sec, void *psecinfo) secinfo = (struct sec_merge_sec_info *) psecinfo; if (!secinfo) - return FALSE; + return false; if (secinfo->first_str == NULL) - return TRUE; + return true; /* FIXME: octets_per_byte. */ hdr = &elf_section_data (sec->output_section)->this_hdr; @@ -859,14 +859,14 @@ _bfd_write_merged_section (bfd *output_bfd, asection *sec, void *psecinfo) contents = NULL; pos = sec->output_section->filepos + sec->output_offset; if (bfd_seek (output_bfd, pos, SEEK_SET) != 0) - return FALSE; + return false; } if (! sec_merge_emit (output_bfd, secinfo->first_str, contents, sec->output_offset)) - return FALSE; + return false; - return TRUE; + return true; } /* Adjust an address in the SEC_MERGE section. Given OFFSET within @@ -928,7 +928,7 @@ _bfd_merged_section_offset (bfd *output_bfd ATTRIBUTE_UNUSED, asection **psec, { p = secinfo->contents + (offset / sec->entsize) * sec->entsize; } - entry = sec_merge_hash_lookup (secinfo->htab, (char *) p, 0, FALSE); + entry = sec_merge_hash_lookup (secinfo->htab, (char *) p, 0, false); if (!entry) { if (! secinfo->htab->strings) |