2010-05-08 Richard Guenther <rguenther@suse.de>

	* lto-wrapper.c (run_gcc): Remove linker output from
	command line for LTRANS invocation.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159174 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d44a020..b3097a6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-08  Richard Guenther  <rguenther@suse.de>
+
+       * lto-wrapper.c (run_gcc): Remove linker output from
+       command line for LTRANS invocation.
+
 2010-05-07  Steven Bosscher  <steven@gcc.gnu.org>
 
        * config.gcc (i[34567]86-*-darwin*, x86_64-*-darwin*): Add

diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index c9a37d9..3d88c8f 100644 (file)
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -369,6 +369,7 @@ run_gcc (unsigned argc, char *argv[])
       const char *collect_gcc_options, *collect_gcc;
       struct obstack env_obstack;
       bool seen_dumpbase = false;
+      bool seen_o = false;
       char *dumpbase_suffix = NULL;
       unsigned j;
 
@@ -422,6 +423,18 @@ run_gcc (unsigned argc, char *argv[])
                dumpbase_suffix = option + 7 + j - i;
                seen_dumpbase = false;
              }
+           if (seen_o)
+             {
+               seen_o = false;
+               continue;
+             }
+
+           /* If we see -o, skip it and its argument.  */
+           if (strncmp (option, "-o", 2) == 0)
+             {
+               seen_o = true;
+               continue;
+             }
 
            /* LTRANS does not need -fwhopr.  */
            if (strncmp (option, "-fwhopr", 7) != 0)