procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spec: add a spec function to join arguments

Browse source 
When passing `-o` flags to other options, the typical `-o foo` spelling
leaves a leading whitespace when replacing elsewhere. This ends up
creating flags spelled as `-some-option-with-arg= foo.ext` which doesn't
parse properly. When attempting to make a spec function to just remove
the leading whitespace, the argument splitting ends up masking the
whitespace. However, the intended extension *also* ends up being its own
argument. To perform the desired behavior, the arguments need to be
concatenated together.

gcc/:

	* gcc.cc (join_spec_func): Add a spec function to join all
	arguments.

Signed-off-by: Ben Boeckel <ben.boeckel@kitware.com>
Co-authored-by: Jason Merrill <jason@redhat.com>
This commit is contained in:
Ben Boeckel 2023-09-01 09:04:01 -04:00 • committed by Jason Merrill
parent 5b554c559d
commit 1e44764bb3
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gcc/gcc.cc
View file

@ -447,6 +447,7 @@ static const char *greater_than_spec_func (int, const char **);
static const char *debug_level_greater_than_spec_func (int, const char **);
static const char *dwarf_version_greater_than_spec_func (int, const char **);
static const char *find_fortran_preinclude_file (int, const char **);
static const char *join_spec_func (int, const char **);
static char *convert_white_space (char *);
static char *quote_spec (char *);
static char *quote_spec_arg (char *);
@ -1772,6 +1773,7 @@ static const struct spec_function static_spec_functions[] =
{ "debug-level-gt", debug_level_greater_than_spec_func },
{ "dwarf-version-gt", dwarf_version_greater_than_spec_func },
{ "fortran-preinclude-file", find_fortran_preinclude_file},
{ "join", join_spec_func},
#ifdef EXTRA_SPEC_FUNCTIONS
EXTRA_SPEC_FUNCTIONS
#endif
@ -10975,6 +10977,27 @@ find_fortran_preinclude_file (int argc, const char **argv)
return result;
}
/* The function takes any number of arguments and joins them together.
This seems to be necessary to build "-fjoined=foo.b" from "-fseparate foo.a"
with a %{fseparate*:-fjoined=%.b$*} rule without adding undesired spaces:
when doing $* replacement we first replace $* with the rest of the switch
(in this case ""), and then add any arguments as arguments after the result,
resulting in "-fjoined= foo.b". Using this function with e.g.
%{fseparate*:-fjoined=%:join(%.b$*)} gets multiple words as separate argv
elements instead of separated by spaces, and we paste them together. */
static const char *
join_spec_func (int argc, const char **argv)
{
if (argc == 1)
return argv[0];
for (int i = 0; i < argc; ++i)
obstack_grow (&obstack, argv[i], strlen (argv[i]));
obstack_1grow (&obstack, '\0');
return XOBFINISH (&obstack, const char *);
}
/* If any character in ORIG fits QUOTE_P (_, P), reallocate the string
so as to precede every one of them with a backslash. Return the
original string or the reallocated one. */