From f38a2680c2f04db6eac4fd87380cd3cf7bcb3bcc Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Wed, 31 Mar 2021 10:39:51 +1030
Subject: Use bool in ld

	* sysdep.h (POISON_BFD_BOOLEAN): Define.
	* configure.ac (elf_list_options, elf_shlib_list_options=false),
	(elf_plt_unwind_list_options=false): Replace FALSE with false,
	and TRUE with true.
	* emulparams/call_nop.sh, * emulparams/cet.sh,
	* emulparams/dynamic_undefined_weak.sh,
	* emulparams/elf32b4300.sh, * emulparams/elf32lm32.sh,
	* emulparams/elf32lr5900.sh, * emulparams/elf32lr5900n32.sh,
	* emulparams/elf32visium.sh, * emulparams/elf_x86_64.sh,
	* emulparams/extern_protected_data.sh, * emulparams/plt_unwind.sh,
	* emulparams/reloc_overflow.sh, * emulparams/static.sh,
	* emulparams/x86-64-lam.sh, * emultempl/aarch64elf.em,
	* emultempl/aix.em, * emultempl/alphaelf.em,
	* emultempl/armcoff.em, * emultempl/armelf.em,
	* emultempl/avrelf.em, * emultempl/beos.em, * emultempl/bfin.em,
	* emultempl/cr16elf.em, * emultempl/crxelf.em,
	* emultempl/cskyelf.em, * emultempl/elf.em, * emultempl/genelf.em,
	* emultempl/hppaelf.em, * emultempl/linux.em,
	* emultempl/m68hc1xelf.em, * emultempl/metagelf.em,
	* emultempl/mipself.em, * emultempl/mmix-elfnmmo.em,
	* emultempl/mmixelf.em, * emultempl/mmo.em, * emultempl/msp430.em,
	* emultempl/nios2elf.em, * emultempl/pdp11.em, * emultempl/pe.em,
	* emultempl/pep.em, * emultempl/ppc32elf.em,
	* emultempl/ppc64elf.em, * emultempl/rxelf.em,
	* emultempl/rxlinux.em, * emultempl/scoreelf.em,
	* emultempl/solaris2.em, * emultempl/spuelf.em,
	* emultempl/ticoff.em, * emultempl/v850elf.em, * emultempl/vms.em,
	* emultempl/xtensaelf.em, * emultempl/z80.em, * ld.h,
	* ldbuildid.c, * ldbuildid.h, * ldcref.c, * ldctor.c, * ldctor.h,
	* ldelf.c, * ldelf.h, * ldelfgen.c, * ldelfgen.h, * ldemul.c,
	* ldemul.h, * ldexp.c, * ldexp.h, * ldfile.c, * ldfile.h,
	* ldgram.y, * ldlang.c, * ldlang.h, * ldmain.c, * ldmain.h,
	* ldmisc.c, * ldmisc.h, * ldwrite.c, * lexsup.c, * mri.c,
	* pe-dll.c, * pe-dll.h, * pep-dll.h, * plugin.c, * plugin.h,
	* testplug.c, * testplug2.c, * testplug3.c, * testplug4.c: Replace
	bfd_boolean with bool, FALSE with false, and TRUE with true.
	* configure: Regenerate.
---
 ld/ldbuildid.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'ld/ldbuildid.c')

diff --git a/ld/ldbuildid.c b/ld/ldbuildid.c
index c55a939..c0e91bc 100644
--- a/ld/ldbuildid.c
+++ b/ld/ldbuildid.c
@@ -32,14 +32,14 @@
 #define streq(a,b)     strcmp ((a), (b)) == 0
 #define strneq(a,b,n)  strncmp ((a), (b), (n)) == 0
 
-bfd_boolean
+bool
 validate_build_id_style (const char *style)
 {
   if ((streq (style, "md5")) || (streq (style, "sha1"))
       || (streq (style, "uuid")) || (strneq (style, "0x", 2)))
-    return TRUE;
+    return true;
 
-  return FALSE;
+  return false;
 }
 
 bfd_size_type
@@ -94,7 +94,7 @@ read_hex (const char xdigit)
   return 0;
 }
 
-bfd_boolean
+bool
 generate_build_id (bfd *abfd,
 		   const char *style,
 		   checksum_fn checksum_contents,
@@ -107,7 +107,7 @@ generate_build_id (bfd *abfd,
 
       md5_init_ctx (&ctx);
       if (!(*checksum_contents) (abfd, (sum_fn) &md5_process_bytes, &ctx))
-	return FALSE;
+	return false;
       md5_finish_ctx (&ctx, id_bits);
     }
   else if (streq (style, "sha1"))
@@ -116,7 +116,7 @@ generate_build_id (bfd *abfd,
 
       sha1_init_ctx (&ctx);
       if (!(*checksum_contents) (abfd, (sum_fn) &sha1_process_bytes, &ctx))
-	return FALSE;
+	return false;
       sha1_finish_ctx (&ctx, id_bits);
     }
   else if (streq (style, "uuid"))
@@ -126,11 +126,11 @@ generate_build_id (bfd *abfd,
       int fd = open ("/dev/urandom", O_RDONLY);
 
       if (fd < 0)
-	return FALSE;
+	return false;
       n = read (fd, id_bits, size);
       close (fd);
       if (n < size)
-	return FALSE;
+	return false;
 #else /* __MINGW32__ */
       typedef RPC_STATUS (RPC_ENTRY * UuidCreateFn) (UUID *);
       UUID          uuid;
@@ -138,18 +138,18 @@ generate_build_id (bfd *abfd,
       HMODULE       rpc_library = LoadLibrary ("rpcrt4.dll");
 
       if (!rpc_library)
-	return FALSE;
+	return false;
       uuid_create = (UuidCreateFn) (void (WINAPI *)(void)) GetProcAddress (rpc_library, "UuidCreate");
       if (!uuid_create)
 	{
 	  FreeLibrary (rpc_library);
-	  return FALSE;
+	  return false;
 	}
 
       if (uuid_create (&uuid) != RPC_S_OK)
 	{
 	  FreeLibrary (rpc_library);
-	  return FALSE;
+	  return false;
 	}
       FreeLibrary (rpc_library);
       memcpy (id_bits, &uuid,
@@ -179,5 +179,5 @@ generate_build_id (bfd *abfd,
   else
     abort ();			/* Should have been validated earlier.  */
 
-  return TRUE;
+  return true;
 }
-- 
cgit v1.1