OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[PATCH] Factor out find_a_program helper around find_a_file

Browse Source 
gcc/
	* gcc.c (find_a_program): New function, factored out of...
	(find_a_file): Here.
	(execute): Use find_a_program when looking for programs rather
	than find_a_file.
This commit is contained in:
John Ericson 2021-09-19 11:08:32 -04:00 committed by Jeff Law
parent 16f9776669
commit 5fee8a0a92
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gcc/gcc.c
View File

@ -367,6 +367,7 @@ static void putenv_from_prefixes (const struct path_prefix *, const char *,
bool); bool);
static int access_check (const char *, int); static int access_check (const char *, int);
static char *find_a_file (const struct path_prefix *, const char *, int, bool); static char *find_a_file (const struct path_prefix *, const char *, int, bool);
static char *find_a_program (const char *);
static void add_prefix (struct path_prefix *, const char *, const char *, static void add_prefix (struct path_prefix *, const char *, const char *,
int, int, int); int, int, int);
static void add_sysrooted_prefix (struct path_prefix *, const char *, static void add_sysrooted_prefix (struct path_prefix *, const char *,
@ -3052,22 +3053,7 @@ find_a_file (const struct path_prefix *pprefix, const char *name, int mode,
{ {
struct file_at_path_info info; struct file_at_path_info info;
#ifdef DEFAULT_ASSEMBLER /* Find the filename in question (special case for absolute paths). */
if (! strcmp (name, "as") && access (DEFAULT_ASSEMBLER, mode) == 0)
return xstrdup (DEFAULT_ASSEMBLER);
#endif
#ifdef DEFAULT_LINKER
if (! strcmp (name, "ld") && access (DEFAULT_LINKER, mode) == 0)
return xstrdup (DEFAULT_LINKER);
#endif
#ifdef DEFAULT_DSYMUTIL
if (! strcmp (name, "dsymutil") && access (DEFAULT_DSYMUTIL, mode) == 0)
return xstrdup (DEFAULT_DSYMUTIL);
#endif
/* Determine the filename to execute (special case for absolute paths). */
if (IS_ABSOLUTE_PATH (name)) if (IS_ABSOLUTE_PATH (name))
{ {
@ -3088,6 +3074,32 @@ find_a_file (const struct path_prefix *pprefix, const char *name, int mode,
file_at_path, &info); file_at_path, &info);
} }
/* Specialization of find_a_file for programs that also takes into account
configure-specified default programs. */
static char*
find_a_program (const char *name)
{
/* Do not search if default matches query. */
#ifdef DEFAULT_ASSEMBLER
if (! strcmp (name, "as") && access (DEFAULT_ASSEMBLER, mode) == 0)
return xstrdup (DEFAULT_ASSEMBLER);
#endif
#ifdef DEFAULT_LINKER
if (! strcmp (name, "ld") && access (DEFAULT_LINKER, mode) == 0)
return xstrdup (DEFAULT_LINKER);
#endif
#ifdef DEFAULT_DSYMUTIL
if (! strcmp (name, "dsymutil") && access (DEFAULT_DSYMUTIL, mode) == 0)
return xstrdup (DEFAULT_DSYMUTIL);
#endif
return find_a_file (&exec_prefixes, name, X_OK, false);
}
/* Ranking of prefixes in the sort list. -B prefixes are put before /* Ranking of prefixes in the sort list. -B prefixes are put before
all others. */ all others. */
@ -3243,8 +3255,7 @@ execute (void)
if (wrapper_string) if (wrapper_string)
{ {
string = find_a_file (&exec_prefixes, string = find_a_program (argbuf[0]);
argbuf[0], X_OK, false);
if (string) if (string)
argbuf[0] = string; argbuf[0] = string;
insert_wrapper (wrapper_string); insert_wrapper (wrapper_string);
@ -3269,7 +3280,7 @@ execute (void)
if (!wrapper_string) if (!wrapper_string)
{ {
string = find_a_file (&exec_prefixes, commands[0].prog, X_OK, false); string = find_a_program(commands[0].prog);
if (string) if (string)
commands[0].argv[0] = string; commands[0].argv[0] = string;
} }
@ -3284,8 +3295,7 @@ execute (void)
commands[n_commands].prog = argbuf[i + 1]; commands[n_commands].prog = argbuf[i + 1];
commands[n_commands].argv commands[n_commands].argv
= &(argbuf.address ())[i + 1]; = &(argbuf.address ())[i + 1];
string = find_a_file (&exec_prefixes, commands[n_commands].prog, string = find_a_program(commands[n_commands].prog);
X_OK, false);
if (string) if (string)
commands[n_commands].argv[0] = string; commands[n_commands].argv[0] = string;
n_commands++; n_commands++;
@ -8556,8 +8566,7 @@ driver::maybe_putenv_COLLECT_LTO_WRAPPER () const
if (have_c) if (have_c)
lto_wrapper_file = NULL; lto_wrapper_file = NULL;
else else
lto_wrapper_file = find_a_file (&exec_prefixes, "lto-wrapper", lto_wrapper_file = find_a_program ("lto-wrapper");
X_OK, false);
if (lto_wrapper_file) if (lto_wrapper_file)
{ {
lto_wrapper_file = convert_white_space (lto_wrapper_file); lto_wrapper_file = convert_white_space (lto_wrapper_file);
@ -8671,7 +8680,7 @@ driver::maybe_print_and_exit () const
#endif #endif
print_prog_name = concat (print_prog_name, use_ld, NULL); print_prog_name = concat (print_prog_name, use_ld, NULL);
} }
char *newname = find_a_file (&exec_prefixes, print_prog_name, X_OK, 0); char *newname = find_a_program (print_prog_name);
printf ("%s\n", (newname ? newname : print_prog_name)); printf ("%s\n", (newname ? newname : print_prog_name));
return (0); return (0);
} }
@ -9070,7 +9079,7 @@ driver::maybe_run_linker (const char *argv0) const
/* We'll use ld if we can't find collect2. */ /* We'll use ld if we can't find collect2. */
if (! strcmp (linker_name_spec, "collect2")) if (! strcmp (linker_name_spec, "collect2"))
{ {
char *s = find_a_file (&exec_prefixes, "collect2", X_OK, false); char *s = find_a_program ("collect2");
if (s == NULL) if (s == NULL)
set_static_spec_shared (&linker_name_spec, "ld"); set_static_spec_shared (&linker_name_spec, "ld");
} }