Revert revision 168407.

2011-01-03  H.J. Lu  <hongjiu.lu@intel.com>

	PR driver/47137
	* gcc.c (main): Revert revision 168407.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7b037c..71e64e4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR driver/47137
+       * gcc.c (main): Revert revision 168407.
+
 2011-01-03  Martin Jambor  <mjambor@suse.cz>
 
        * lto-cgraph.c (input_cgraph_opt_section): Use the correct section type.

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 0d633a4..69bf033 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -6582,7 +6582,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
 
   explicit_link_files = XCNEWVEC (char, n_infiles);
 
-  combine_inputs = flag_wpa;
+  combine_inputs = have_o || flag_wpa;
 
   for (i = 0; (int) i < n_infiles; i++)
     {