aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 f99a411..aebe391 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR driver/47137
+ * gcc.c (main): Don't check have_o when settting combine_inputs.
+
2011-01-02 Eric Botcazou <ebotcazou@adacore.com>
* regrename.c: Add general comment describing the pass.
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 69bf033..0d633a4 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 = have_o || flag_wpa;
+ combine_inputs = flag_wpa;
for (i = 0; (int) i < n_infiles; i++)
{