From 56b721c5912aa1594dafc92cee1d84c626c3245d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 3 Jan 2011 15:03:05 +0000 Subject: [PATCH] Revert revision 168407. 2011-01-03 H.J. Lu PR driver/47137 * gcc.c (main): Revert revision 168407. From-SVN: r168429 --- gcc/ChangeLog | 5 +++++ gcc/gcc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c7b037c1647..71e64e4b9cd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-01-03 H.J. Lu + + PR driver/47137 + * gcc.c (main): Revert revision 168407. + 2011-01-03 Martin Jambor * lto-cgraph.c (input_cgraph_opt_section): Use the correct section type. diff --git a/gcc/gcc.c b/gcc/gcc.c index 0d633a4cd6b..69bf0336ead 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++) { -- 2.30.2