Miscellaneous BFD int vs bfd_boolean fixes
Alan Modra
amodra@gmail.com
Mon Mar 29 00:40:54 GMT 2021
nds32 hyper_relax takes values of 0, 1 and 2. vms_write_data_block
return TRUE/FALSE not positive/negative.
* coff-z80.c (z80_is_local_label_name): Return bfd_boolean.
* elf32-z80.c (z80_is_local_label_name): Likewise.
* elf32-spu.c (spu_elf_modify_headers): Likewise.
* elf32-nds32.h (struct elf_nds32_link_hash_table <hyper_relax>):
Change type to int.
* vms-lib.c (_bfd_vms_lib_write_archive_contents): Correct test
for error return from vms_write_data_block.
diff --git a/bfd/coff-z80.c b/bfd/coff-z80.c
index 9d1d9c599cb..a47a5385773 100644
--- a/bfd/coff-z80.c
+++ b/bfd/coff-z80.c
@@ -452,7 +452,7 @@ extra_case (bfd *in_abfd,
}
}
-static int
+static bfd_boolean
z80_is_local_label_name (bfd * abfd ATTRIBUTE_UNUSED,
const char * name)
{
diff --git a/bfd/elf32-nds32.h b/bfd/elf32-nds32.h
index e7853cf129f..0f496361555 100644
--- a/bfd/elf32-nds32.h
+++ b/bfd/elf32-nds32.h
@@ -126,7 +126,7 @@ struct elf_nds32_link_hash_table
int relax_fp_as_gp; /* --mrelax-omit-fp. */
int eliminate_gc_relocs; /* --meliminate-gc-relocs. */
FILE *sym_ld_script; /* --mgen-symbol-ld-script=<file>. */
- bfd_boolean hyper_relax; /* Relax for symbol not in RW sections. */
+ int hyper_relax; /* Relax for symbol not in RW sections. */
int tls_desc_trampoline; /* --m[no-]tlsdesc-trampoline. */
/* Disable if linking a dynamically linked executable. */
int load_store_relax;
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index c31ab98b310..1058df13289 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -5346,7 +5346,7 @@ spu_elf_fake_sections (bfd *obfd ATTRIBUTE_UNUSED,
/* Tweak phdrs before writing them out. */
-static int
+static bfd_boolean
spu_elf_modify_headers (bfd *abfd, struct bfd_link_info *info)
{
if (info != NULL)
diff --git a/bfd/elf32-z80.c b/bfd/elf32-z80.c
index 5634fa132bb..80f4ab52143 100644
--- a/bfd/elf32-z80.c
+++ b/bfd/elf32-z80.c
@@ -550,7 +550,7 @@ z80_elf_object_p (bfd *abfd)
return bfd_default_set_arch_mach (abfd, bfd_arch_z80, mach);
}
-static int
+static bfd_boolean
z80_is_local_label_name (bfd * abfd ATTRIBUTE_UNUSED,
const char * name)
{
diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c
index eaac8af2a22..72038b4c89e 100644
--- a/bfd/vms-lib.c
+++ b/bfd/vms-lib.c
@@ -2280,7 +2280,7 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
else
{
/* Write the MHD. */
- if (vms_write_data_block (arch, &data, &off, blk, sz, 0) < 0)
+ if (!vms_write_data_block (arch, &data, &off, blk, sz, 0))
goto input_err;
/* Write the member. */
@@ -2289,13 +2289,13 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
sz = bfd_bread (blk, sizeof (blk), current);
if (sz == 0)
break;
- if (vms_write_data_block (arch, &data, &off, blk, sz, 0) < 0)
+ if (!vms_write_data_block (arch, &data, &off, blk, sz, 0))
goto input_err;
}
/* Write the end of module marker. */
- if (vms_write_data_block (arch, &data, &off,
- eotdesc, sizeof (eotdesc), 1) < 0)
+ if (!vms_write_data_block (arch, &data, &off,
+ eotdesc, sizeof (eotdesc), 1))
goto input_err;
}
}
--
Alan Modra
Australia Development Lab, IBM
More information about the Binutils
mailing list