diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-01-26 15:25:56 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-01-26 15:25:56 +0100 |
| commit | b0b35f86a24b8c404590993d7811fe546fadf1eb (patch) | |
| tree | 3665173bd5798fa89d10c639553bd42fc5c74950 | |
| parent | b8b025dc0b76361d1276288aeeda6b4ebc5e2061 (diff) | |
| download | gcc-b0b35f86a24b8c404590993d7811fe546fadf1eb.zip gcc-b0b35f86a24b8c404590993d7811fe546fadf1eb.tar.gz gcc-b0b35f86a24b8c404590993d7811fe546fadf1eb.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/lto-wrapper.c | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4dba48f..1d5f103 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index 16d1f45..e636b8b 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -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; } |