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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d6f43094515f0e676bea52ece2605ef42d79cb56..c59df62ed0f83e7c3492302432b94d9bfdd536d1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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.

diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index 84f59cf1a1f1d62aecc46b2bf2f29a8091c21235..c88b8ecf18ae343070625c8ad13a5879f856171f 100644 (file)
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -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);