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

re PR driver/91130 (-MF clashes with -flto on aarch64) 

2019-08-12  Richard Biener  <rguenther@suse.de>

	PR driver/91130
	* lto-wrapper.c (get_options_from_collect_gcc_options): Remove
	lang_mask option, always use CL_DRIVER.
	(get_options_from_collect_gcc_options): Adjust.
	(find_and_merge_options): Likewise.
	(run_gcc): Likewise.

From-SVN: r274309
This commit is contained in:
Richard Biener 2019-08-12 10:59:58 +00:00 committed by Richard Biener
parent 8467866f26
commit 8508ae1de0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2019-08-12 Richard Biener <rguenther@suse.de>
PR driver/91130
* lto-wrapper.c (get_options_from_collect_gcc_options): Remove
lang_mask option, always use CL_DRIVER.
(get_options_from_collect_gcc_options): Adjust.
(find_and_merge_options): Likewise.
(run_gcc): Likewise.
2019-08-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* ipa-predicate.c (add_condition): Restore inverted test.

10
gcc/lto-wrapper.c
View File

@ -128,12 +128,11 @@ maybe_unlink (const char *file)
#define DUMPBASE_SUFFIX ".ltrans18446744073709551615"
/* Create decoded options from the COLLECT_GCC and COLLECT_GCC_OPTIONS
environment according to LANG_MASK. */
environment. */
static void
get_options_from_collect_gcc_options (const char *collect_gcc,
const char *collect_gcc_options,
unsigned int lang_mask,
struct cl_decoded_option **decoded_options,
unsigned int *decoded_options_count)
{
@ -176,8 +175,7 @@ get_options_from_collect_gcc_options (const char *collect_gcc,
argc = obstack_object_size (&argv_obstack) / sizeof (void *) - 1;
argv = XOBFINISH (&argv_obstack, const char **);
decode_cmdline_options_to_array (argc, (const char **)argv,
lang_mask,
decode_cmdline_options_to_array (argc, (const char **)argv, CL_DRIVER,
decoded_options, decoded_options_count);
obstack_free (&argv_obstack, NULL);
}
@ -1009,8 +1007,7 @@ find_and_merge_options (int fd, off_t file_offset, const char *prefix,
{
struct cl_decoded_option *f2decoded_options;
unsigned int f2decoded_options_count;
get_options_from_collect_gcc_options (collect_gcc,
fopts, CL_DRIVER,
get_options_from_collect_gcc_options (collect_gcc, fopts,
&f2decoded_options,
&f2decoded_options_count);
if (!fdecoded_options)
@ -1282,7 +1279,6 @@ run_gcc (unsigned argc, char *argv[])
fatal_error (input_location,
"environment variable %<COLLECT_GCC_OPTIONS%> must be set");
get_options_from_collect_gcc_options (collect_gcc, collect_gcc_options,
CL_DRIVER,
&decoded_options,
&decoded_options_count);