diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2015-02-06 13:55:42 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2015-02-06 05:55:42 -0800 |
| commit | 514ba9e4ad87531575da90b028c9882b1e793963 (patch) | |
| tree | 93aa8793d2c6b5abbf46ddfbca7ef0f2cf37bfd0 /lto-plugin | |
| parent | d26ac279bca9a071d5f4de994b1dc8cd214335c2 (diff) | |
| download | gcc-514ba9e4ad87531575da90b028c9882b1e793963.tar.gz | |
Revert the PR lto/64837 fix
It breaks gold:
% echo "int main () {}" | gcc -fuse-ld=gold -flto -x c++ -
ld.gold: internal error in remove_writer, at token.h:132
collect2: error: ld returned 1 exit status
* lto-plugin.c (release_input_file): Removed.
(claim_file_handler): Don't call release_input_file.
(onload): Don't set release_input_file.
From-SVN: r220477
Diffstat (limited to 'lto-plugin')
| -rw-r--r-- | lto-plugin/ChangeLog | 6 | ||||
| -rw-r--r-- | lto-plugin/lto-plugin.c | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index 82d62ae2564..2d6152fec24 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,9 @@ +2015-02-06 H.J. Lu <hongjiu.lu@intel.com> + + * lto-plugin.c (release_input_file): Removed. + (claim_file_handler): Don't call release_input_file. + (onload): Don't set release_input_file. + 2015-02-05 H.J. Lu <hongjiu.lu@intel.com> * lto-plugin.c (claim_file_handler): Pass handle to diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c index 44d0e3043b5..8d957402ba6 100644 --- a/lto-plugin/lto-plugin.c +++ b/lto-plugin/lto-plugin.c @@ -145,7 +145,6 @@ static ld_plugin_register_all_symbols_read register_all_symbols_read; static ld_plugin_get_symbols get_symbols, get_symbols_v2; static ld_plugin_register_cleanup register_cleanup; static ld_plugin_add_input_file add_input_file; -static ld_plugin_release_input_file release_input_file; static ld_plugin_add_input_library add_input_library; static ld_plugin_message message; static ld_plugin_add_symbols add_symbols; @@ -998,9 +997,6 @@ claim_file_handler (const struct ld_plugin_input_file *file, int *claimed) *claimed = 1; - if (release_input_file) - release_input_file (file->handle); - goto cleanup; err: @@ -1095,9 +1091,6 @@ onload (struct ld_plugin_tv *tv) case LDPT_ADD_INPUT_FILE: add_input_file = p->tv_u.tv_add_input_file; break; - case LDPT_RELEASE_INPUT_FILE: - release_input_file = p->tv_u.tv_release_input_file; - break; case LDPT_ADD_INPUT_LIBRARY: add_input_library = p->tv_u.tv_add_input_library; break; |