gcc/
	PR target/58115
	* target-globals.c (save_target_globals): Remove this_fn_optab
	handling.
	* toplev.c: Include optabs.h.
	(target_reinit): Temporarily restore the global options if another
	set of options are in force.

gcc/testsuite/
	* gcc.target/i386/intrinsics_4.c (bar): New function.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206394 138bc75d-0d04-0410-961f-82ee72b054a4