git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR lto/69254 (ICE in streamer_get_builtin_tree when using -fsanitize=shift on the compile side only) 

PR lto/69254
	* lto-wrapper.c (merge_and_complain): Handle -fcilkplus.
	(append_compiler_options): Handle -fcilkplus.
	(append_linker_options): Ignore -fno-{openmp,openacc,cilkplus}.

From-SVN: r232829
This commit is contained in:
Jakub Jelinek 2016-01-26 15:25:56 +01:00 committed by Jakub Jelinek
parent b8b025dc0b
commit b0b35f86a2
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2016-01-26 Jakub Jelinek <jakub@redhat.com>
PR lto/69254
* lto-wrapper.c (merge_and_complain): Handle -fcilkplus.
(append_compiler_options): Handle -fcilkplus.
(append_linker_options): Ignore -fno-{openmp,openacc,cilkplus}.
2016-01-26 Nick Clifton <nickc@redhat.com>
PR target/66655

11
gcc/lto-wrapper.c
View File

@ -277,6 +277,7 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
case OPT_fwrapv:
case OPT_fopenmp:
case OPT_fopenacc:
case OPT_fcilkplus:
case OPT_fcheck_pointer_bounds:
/* For selected options we can merge conservatively. */
for (j = 0; j < *decoded_options_count; ++j)
@ -505,6 +506,7 @@ append_compiler_options (obstack *argv_obstack, struct cl_decoded_option *opts,
case OPT_fwrapv:
case OPT_fopenmp:
case OPT_fopenacc:
case OPT_fcilkplus:
case OPT_ftrapv:
case OPT_fstrict_overflow:
case OPT_foffload_abi_:
@ -558,6 +560,15 @@ append_linker_options (obstack *argv_obstack, struct cl_decoded_option *opts,
??? We fail to diagnose a possible mismatch here. */
continue;
case OPT_fopenmp:
case OPT_fopenacc:
case OPT_fcilkplus:
/* Ignore -fno-XXX form of these options, as otherwise
corresponding builtins will not be enabled. */
if (option->value == 0)
continue;
break;
default:
break;
}