aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2011-01-03 15:03:05 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2011-01-03 07:03:05 -0800
commit56b721c5912aa1594dafc92cee1d84c626c3245d (patch)
tree843b789d2d81832bbc7055437a7036561199a3c3
parent839d549b58592ddc44a188a6134b705bcfab7a8d (diff)
downloadgcc-56b721c5912aa1594dafc92cee1d84c626c3245d.zip
gcc-56b721c5912aa1594dafc92cee1d84c626c3245d.tar.gz
gcc-56b721c5912aa1594dafc92cee1d84c626c3245d.tar.bz2
Revert revision 168407.
2011-01-03 H.J. Lu <hongjiu.lu@intel.com> PR driver/47137 * gcc.c (main): Revert revision 168407. From-SVN: r168429
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/gcc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7b037c..71e64e4 100644
--- 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
--- 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++)
{