@@ -1,3 +1,9 @@
+2015-08-10 Thomas Schwinge <thomas@codesourcery.com>
+
+ * internal-fn.c (expand_GOACC_DIM_SIZE) [!HAVE_oacc_dim_size]:
+ Don't define and set variable val.
+ (expand_GOACC_DIM_POS) [!HAVE_oacc_dim_pos]: Likewise.
+
2015-08-06 Cesar Philippidis <cesar@codesourcery.com>
* config/nvptx/nvptx.c (nvptx_expand_lock_unlock): Pass an
@@ -1993,9 +1993,9 @@ expand_GOACC_DIM_SIZE (gcall *stmt)
return;
rtx target = expand_expr (lhs, NULL_RTX, VOIDmode, EXPAND_WRITE);
- rtx val = expand_expr (gimple_call_arg (stmt, 0), NULL_RTX,
- VOIDmode, EXPAND_NORMAL);
#ifdef HAVE_oacc_dim_size
+ rtx val = expand_expr (gimple_call_arg (stmt, 0), NULL_RTX,
+ VOIDmode, EXPAND_NORMAL);
emit_insn (gen_oacc_dim_size (target, val));
#else
emit_move_insn (target, const1_rtx);
@@ -2011,9 +2011,9 @@ expand_GOACC_DIM_POS (gcall *stmt)
return;
rtx target = expand_expr (lhs, NULL_RTX, VOIDmode, EXPAND_WRITE);
- rtx val = expand_expr (gimple_call_arg (stmt, 0), NULL_RTX,
- VOIDmode, EXPAND_NORMAL);
#ifdef HAVE_oacc_dim_pos
+ rtx val = expand_expr (gimple_call_arg (stmt, 0), NULL_RTX,
+ VOIDmode, EXPAND_NORMAL);
emit_insn (gen_oacc_dim_pos (target, val));
#else
emit_move_insn (target, const0_rtx);