diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-03 15:03:05 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-03 15:03:05 +0000 |
| commit | 9dbb005d0ae541e6366cb014a8a6d6f885805b08 (patch) | |
| tree | 843b789d2d81832bbc7055437a7036561199a3c3 | |
| parent | 783bc09c70b701dde890ccdd2a9d2ccb0d84ddc4 (diff) | |
| download | gcc-9dbb005d0ae541e6366cb014a8a6d6f885805b08.tar.gz | |
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
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/gcc.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 <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 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++) { |