forked from Imagelibrary/binutils-gdb
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.
This commit is contained in:
74
ld/ldfile.c
74
ld/ldfile.c
@@ -39,7 +39,7 @@
|
||||
#include "plugin.h"
|
||||
#endif /* BFD_SUPPORTS_PLUGINS */
|
||||
|
||||
bfd_boolean ldfile_assumed_script = FALSE;
|
||||
bool ldfile_assumed_script = false;
|
||||
const char *ldfile_output_machine_name = "";
|
||||
unsigned long ldfile_output_machine;
|
||||
enum bfd_architecture ldfile_output_architecture;
|
||||
@@ -68,19 +68,19 @@ static search_arch_type **search_arch_tail_ptr = &search_arch_head;
|
||||
/* Test whether a pathname, after canonicalization, is the same or a
|
||||
sub-directory of the sysroot directory. */
|
||||
|
||||
static bfd_boolean
|
||||
static bool
|
||||
is_sysrooted_pathname (const char *name)
|
||||
{
|
||||
char *realname;
|
||||
int len;
|
||||
bfd_boolean result;
|
||||
bool result;
|
||||
|
||||
if (ld_canon_sysroot == NULL)
|
||||
return FALSE;
|
||||
return false;
|
||||
|
||||
realname = lrealpath (name);
|
||||
len = strlen (realname);
|
||||
result = FALSE;
|
||||
result = false;
|
||||
if (len > ld_canon_sysroot_len
|
||||
&& IS_DIR_SEPARATOR (realname[ld_canon_sysroot_len]))
|
||||
{
|
||||
@@ -96,7 +96,7 @@ is_sysrooted_pathname (const char *name)
|
||||
Makes a copy of NAME using xmalloc(). */
|
||||
|
||||
void
|
||||
ldfile_add_library_path (const char *name, bfd_boolean cmdline)
|
||||
ldfile_add_library_path (const char *name, bool cmdline)
|
||||
{
|
||||
search_dirs_type *new_dirs;
|
||||
|
||||
@@ -121,7 +121,7 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
|
||||
|
||||
/* Try to open a BFD for a lang_input_statement. */
|
||||
|
||||
bfd_boolean
|
||||
bool
|
||||
ldfile_try_open_bfd (const char *attempt,
|
||||
lang_input_statement_type *entry)
|
||||
{
|
||||
@@ -139,7 +139,7 @@ ldfile_try_open_bfd (const char *attempt,
|
||||
{
|
||||
if (bfd_get_error () == bfd_error_invalid_target)
|
||||
einfo (_("%F%P: invalid BFD target `%s'\n"), entry->target);
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
track_dependency_files (attempt);
|
||||
@@ -162,8 +162,8 @@ ldfile_try_open_bfd (const char *attempt,
|
||||
a dynamic object.
|
||||
|
||||
In the code below, it's OK to exit early if the check fails,
|
||||
closing the checked BFD and returning FALSE, but if the BFD
|
||||
checks out compatible, do not exit early returning TRUE, or
|
||||
closing the checked BFD and returning false, but if the BFD
|
||||
checks out compatible, do not exit early returning true, or
|
||||
the plugins will not get a chance to claim the file. */
|
||||
|
||||
if (entry->flags.search_dirs || !entry->flags.dynamic)
|
||||
@@ -191,7 +191,7 @@ ldfile_try_open_bfd (const char *attempt,
|
||||
/* Try to interpret the file as a linker script. */
|
||||
ldfile_open_command_file (attempt);
|
||||
|
||||
ldfile_assumed_script = TRUE;
|
||||
ldfile_assumed_script = true;
|
||||
parser_input = input_selected;
|
||||
ldlex_both ();
|
||||
token = INPUT_SCRIPT;
|
||||
@@ -258,7 +258,7 @@ ldfile_try_open_bfd (const char *attempt,
|
||||
token = yylex ();
|
||||
}
|
||||
ldlex_popstate ();
|
||||
ldfile_assumed_script = FALSE;
|
||||
ldfile_assumed_script = false;
|
||||
fclose (yyin);
|
||||
yyin = NULL;
|
||||
if (skip)
|
||||
@@ -269,7 +269,7 @@ ldfile_try_open_bfd (const char *attempt,
|
||||
attempt, entry->local_sym_name);
|
||||
bfd_close (entry->the_bfd);
|
||||
entry->the_bfd = NULL;
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
goto success;
|
||||
@@ -281,7 +281,7 @@ ldfile_try_open_bfd (const char *attempt,
|
||||
attempt);
|
||||
bfd_close (entry->the_bfd);
|
||||
entry->the_bfd = NULL;
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (entry->flags.search_dirs
|
||||
@@ -299,7 +299,7 @@ ldfile_try_open_bfd (const char *attempt,
|
||||
attempt, entry->local_sym_name);
|
||||
bfd_close (entry->the_bfd);
|
||||
entry->the_bfd = NULL;
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -322,13 +322,13 @@ ldfile_try_open_bfd (const char *attempt,
|
||||
|
||||
/* It opened OK, the format checked out, and the plugins have had
|
||||
their chance to claim it, so this is success. */
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Search for and open the file specified by ENTRY. If it is an
|
||||
archive, use ARCH, LIB and SUFFIX to modify the file name. */
|
||||
|
||||
bfd_boolean
|
||||
bool
|
||||
ldfile_open_file_search (const char *arch,
|
||||
lang_input_statement_type *entry,
|
||||
const char *lib,
|
||||
@@ -347,15 +347,15 @@ ldfile_open_file_search (const char *arch,
|
||||
if (ldfile_try_open_bfd (name, entry))
|
||||
{
|
||||
entry->filename = name;
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
free (name);
|
||||
}
|
||||
else if (ldfile_try_open_bfd (entry->filename, entry))
|
||||
return TRUE;
|
||||
return true;
|
||||
|
||||
if (IS_ABSOLUTE_PATH (entry->filename))
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
for (search = search_head; search != NULL; search = search->next)
|
||||
@@ -365,7 +365,7 @@ ldfile_open_file_search (const char *arch,
|
||||
if (entry->flags.dynamic && !bfd_link_relocatable (&link_info))
|
||||
{
|
||||
if (ldemul_open_dynamic_archive (arch, search, entry))
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (entry->flags.maybe_archive && !entry->flags.full_name_provided)
|
||||
@@ -378,13 +378,13 @@ ldfile_open_file_search (const char *arch,
|
||||
if (ldfile_try_open_bfd (string, entry))
|
||||
{
|
||||
entry->filename = string;
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
free (string);
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Open the input file specified by ENTRY.
|
||||
@@ -409,13 +409,13 @@ ldfile_open_file (lang_input_statement_type *entry)
|
||||
else
|
||||
einfo (_("%P: cannot find %s: %E\n"), entry->local_sym_name);
|
||||
|
||||
entry->flags.missing_file = TRUE;
|
||||
input_flags.missing_file = TRUE;
|
||||
entry->flags.missing_file = true;
|
||||
input_flags.missing_file = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
search_arch_type *arch;
|
||||
bfd_boolean found = FALSE;
|
||||
bool found = false;
|
||||
|
||||
/* If extra_search_path is set, entry->filename is a relative path.
|
||||
Search the directory of the current linker script before searching
|
||||
@@ -427,7 +427,7 @@ ldfile_open_file (lang_input_statement_type *entry)
|
||||
if (ldfile_try_open_bfd (path, entry))
|
||||
{
|
||||
entry->filename = path;
|
||||
entry->flags.search_dirs = FALSE;
|
||||
entry->flags.search_dirs = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -453,7 +453,7 @@ ldfile_open_file (lang_input_statement_type *entry)
|
||||
/* If we have found the file, we don't need to search directories
|
||||
again. */
|
||||
if (found)
|
||||
entry->flags.search_dirs = FALSE;
|
||||
entry->flags.search_dirs = false;
|
||||
else
|
||||
{
|
||||
if (entry->flags.sysrooted
|
||||
@@ -513,8 +513,8 @@ ldfile_open_file (lang_input_statement_type *entry)
|
||||
}
|
||||
}
|
||||
|
||||
entry->flags.missing_file = TRUE;
|
||||
input_flags.missing_file = TRUE;
|
||||
entry->flags.missing_file = true;
|
||||
input_flags.missing_file = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -522,7 +522,7 @@ ldfile_open_file (lang_input_statement_type *entry)
|
||||
/* Try to open NAME. */
|
||||
|
||||
static FILE *
|
||||
try_open (const char *name, bfd_boolean *sysrooted)
|
||||
try_open (const char *name, bool *sysrooted)
|
||||
{
|
||||
FILE *result;
|
||||
|
||||
@@ -544,12 +544,12 @@ try_open (const char *name, bfd_boolean *sysrooted)
|
||||
|
||||
/* Return TRUE iff directory DIR contains an "ldscripts" subdirectory. */
|
||||
|
||||
static bfd_boolean
|
||||
static bool
|
||||
check_for_scripts_dir (char *dir)
|
||||
{
|
||||
char *buf;
|
||||
struct stat s;
|
||||
bfd_boolean res;
|
||||
bool res;
|
||||
|
||||
buf = concat (dir, "/ldscripts", (const char *) NULL);
|
||||
res = stat (buf, &s) == 0 && S_ISDIR (s.st_mode);
|
||||
@@ -604,8 +604,8 @@ find_scripts_dir (void)
|
||||
|
||||
static FILE *
|
||||
ldfile_find_command_file (const char *name,
|
||||
bfd_boolean default_only,
|
||||
bfd_boolean *sysrooted)
|
||||
bool default_only,
|
||||
bool *sysrooted)
|
||||
{
|
||||
search_dirs_type *search;
|
||||
FILE *result = NULL;
|
||||
@@ -627,7 +627,7 @@ ldfile_find_command_file (const char *name,
|
||||
{
|
||||
search_dirs_type **save_tail_ptr = search_tail_ptr;
|
||||
search_tail_ptr = &script_search;
|
||||
ldfile_add_library_path (script_dir, TRUE);
|
||||
ldfile_add_library_path (script_dir, true);
|
||||
search_tail_ptr = save_tail_ptr;
|
||||
}
|
||||
}
|
||||
@@ -673,7 +673,7 @@ static void
|
||||
ldfile_open_command_file_1 (const char *name, enum script_open_style open_how)
|
||||
{
|
||||
FILE *ldlex_input_stack;
|
||||
bfd_boolean sysrooted;
|
||||
bool sysrooted;
|
||||
static struct script_name_list *processed_scripts = NULL;
|
||||
struct script_name_list *script;
|
||||
size_t len;
|
||||
|
||||
Reference in New Issue
Block a user