Skip to content

Commit

Permalink
Revert the PR lto/64837 fix
Browse files Browse the repository at this point in the history
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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220477 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
hjl committed Feb 6, 2015
1 parent bb779bf commit 7350887
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
6 changes: 6 additions & 0 deletions lto-plugin/ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 0 additions & 7 deletions lto-plugin/lto-plugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7350887

Please sign in to comment.