Hi! On Thu, 21 Nov 2013 20:20:45 -0000, ja...@gcc.gnu.org wrote: > Author: jakub > Date: Thu Nov 21 20:20:44 2013 > New Revision: 205231 > > URL: http://gcc.gnu.org/viewcvs?rev=205231&root=gcc&view=rev > Log: > svn merge -r204964:205223 svn+ssh://gcc.gnu.org/svn/gcc/trunk
Jakub, many thanks for handling the vast majority of the merge changes! I only had to fix one additional case, r205658: gcc/ * gimple.h (is_a_helper): Handle GIMPLE_OACC_PARALLEL. --- gcc/gimple.h +++ gcc/gimple.h @@ -969,7 +969,8 @@ template <> inline bool is_a_helper <const gimple_statement_omp_parallel>::test (const_gimple gs) { - return gs->code == GIMPLE_OMP_PARALLEL || gs->code == GIMPLE_OMP_TASK || gs->code == GIMPLE_OMP_TARGET; + return gs->code == GIMPLE_OMP_PARALLEL || gs->code == GIMPLE_OMP_TASK + || gs->code == GIMPLE_OMP_TARGET || gs->code == GIMPLE_OACC_PARALLEL; } template <> Grüße, Thomas
pgpKT5E2HMfZD.pgp
Description: PGP signature