.:

[pf3gnuchains/gcc-fork.git] / gcc / config / s390 / s390.c

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index be3aeae..627940c 100644 (file)
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -6928,11 +6928,13 @@ s390_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED)
   n_gpr = current_function_args_info.gprs;
   n_fpr = current_function_args_info.fprs;
 
-  t = build (MODIFY_EXPR, TREE_TYPE (gpr), gpr, build_int_2 (n_gpr, 0));
+  t = build (MODIFY_EXPR, TREE_TYPE (gpr), gpr,
+            build_int_cst (NULL_TREE, n_gpr, 0));
   TREE_SIDE_EFFECTS (t) = 1;
   expand_expr (t, const0_rtx, VOIDmode, EXPAND_NORMAL);
 
-  t = build (MODIFY_EXPR, TREE_TYPE (fpr), fpr, build_int_2 (n_fpr, 0));
+  t = build (MODIFY_EXPR, TREE_TYPE (fpr), fpr,
+            build_int_cst (NULL_TREE, n_fpr, 0));
   TREE_SIDE_EFFECTS (t) = 1;
   expand_expr (t, const0_rtx, VOIDmode, EXPAND_NORMAL);
 
@@ -6945,7 +6947,7 @@ s390_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED)
     fprintf (stderr, "va_start: n_gpr = %d, n_fpr = %d off %d\n",
             (int)n_gpr, (int)n_fpr, off);
 
-  t = build (PLUS_EXPR, TREE_TYPE (ovf), t, build_int_2 (off, 0));
+  t = build (PLUS_EXPR, TREE_TYPE (ovf), t, build_int_cst (NULL_TREE, off, 0));
 
   t = build (MODIFY_EXPR, TREE_TYPE (ovf), ovf, t);
   TREE_SIDE_EFFECTS (t) = 1;
@@ -6955,11 +6957,12 @@ s390_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED)
   t = make_tree (TREE_TYPE (sav), return_address_pointer_rtx);
   if (TARGET_KERNEL_BACKCHAIN)
     t = build (PLUS_EXPR, TREE_TYPE (sav), t,
-              build_int_2 (-(RETURN_REGNUM - 2) * UNITS_PER_WORD
-                           - (TARGET_64BIT ? 4 : 2) * 8, -1));
+              build_int_cst (NULL_TREE,
+                             -(RETURN_REGNUM - 2) * UNITS_PER_WORD
+                             - (TARGET_64BIT ? 4 : 2) * 8, -1));
   else
     t = build (PLUS_EXPR, TREE_TYPE (sav), t,
-              build_int_2 (-RETURN_REGNUM * UNITS_PER_WORD, -1));
+              build_int_cst (NULL_TREE, -RETURN_REGNUM * UNITS_PER_WORD, -1));
 
   t = build (MODIFY_EXPR, TREE_TYPE (sav), sav, t);
   TREE_SIDE_EFFECTS (t) = 1;