I've applied this to gomp4 branch. 1) ports the break fix in gimple-fold from trunk
2) fixes missing tab in ptx output. nathan
2015-10-09 Nathan Sidwell <nat...@acm.org> * config/nvptx/nvptx.c (nvptx_init_axis_predicate): Fix output formatting. PR 67861 * gimple-fold.c (gimple_fold_builtin): Add break after BUILT_IN_PRINTF_CHK, BUILT_IN_VPRINTF_CHK folding. Index: gcc/config/nvptx/nvptx.c =================================================================== --- gcc/config/nvptx/nvptx.c (revision 228656) +++ gcc/config/nvptx/nvptx.c (working copy) @@ -629,8 +629,7 @@ static void nvptx_init_axis_predicate (FILE *file, int regno, const char *name) { fprintf (file, "\t{\n"); - - fprintf (file, "\t.reg.u32\t%%%s;\n", name); + fprintf (file, "\t\t.reg.u32\t%%%s;\n", name); fprintf (file, "\t\tmov.u32\t%%%s, %%tid.%s;\n", name, name); fprintf (file, "\t\tsetp.ne.u32\t%%r%d, %%%s, 0;\n", regno, name); fprintf (file, "\t}\n"); Index: gcc/gimple-fold.c =================================================================== --- gcc/gimple-fold.c (revision 228656) +++ gcc/gimple-fold.c (working copy) @@ -2890,6 +2890,7 @@ gimple_fold_builtin (gimple_stmt_iterato n == 3 ? gimple_call_arg (stmt, 2) : NULL_TREE, fcode); + break; case BUILT_IN_ACC_ON_DEVICE: return gimple_fold_builtin_acc_on_device (gsi, gimple_call_arg (stmt, 0));