gcc/ada/

[pf3gnuchains/gcc-fork.git] / gcc / ada / cuintp.c

diff --git a/gcc/ada/cuintp.c b/gcc/ada/cuintp.c
index 7adc057..ba3ffa0 100644 (file)
--- a/gcc/ada/cuintp.c
+++ b/gcc/ada/cuintp.c
@@ -6,18 +6,17 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *          Copyright (C) 1992-2005 Free Software Foundation, Inc.          *
+ *          Copyright (C) 1992-2007, Free Software Foundation, Inc.         *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
- * ware  Foundation;  either version 2,  or (at your option) any later ver- *
+ * ware  Foundation;  either version 3,  or (at your option) any later ver- *
  * sion.  GNAT is distributed in the hope that it will be useful, but WITH- *
  * OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY *
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License *
- * for  more details.  You should have  received  a copy of the GNU General *
- * Public License  distributed with GNAT;  see file COPYING.  If not, write *
- * to  the  Free Software Foundation,  51  Franklin  Street,  Fifth  Floor, *
- * Boston, MA 02110-1301, USA.                                              *
+ * for  more details.  You should have received a copy of the GNU General   *
+ * Public License along with GCC; see the file COPYING3.  If not see        *
+ * <http://www.gnu.org/licenses/>.                                          *
  *                                                                          *
  * GNAT was originally developed  by the GNAT team at  New York University. *
  * Extensive contributions were provided by Ada Core Technologies Inc.      *
@@ -62,7 +61,7 @@ build_cst_from_int (tree type, HOST_WIDE_INT low)
   if (TREE_CODE (type) == REAL_TYPE)
     return convert (type, build_int_cst (NULL_TREE, low));
   else
-    return force_fit_type (build_int_cst (type, low), false, false, false);
+    return build_int_cst_type (type, low);
 }
 
 /* Similar to UI_To_Int, but return a GCC INTEGER_CST or REAL_CST node,
@@ -113,18 +112,18 @@ UI_To_gnu (Uint Input, tree type)
       gnu_ret = build_cst_from_int (comp_type, First);
       if (First < 0)
        for (Idx++, Length--; Length; Idx++, Length--)
-         gnu_ret = fold (build2 (MINUS_EXPR, comp_type,
-                                 fold (build2 (MULT_EXPR, comp_type,
-                                               gnu_ret, gnu_base)),
-                                 build_cst_from_int (comp_type,
-                                                     Udigits_Ptr[Idx])));
+         gnu_ret = fold_build2 (MINUS_EXPR, comp_type,
+                                fold_build2 (MULT_EXPR, comp_type,
+                                             gnu_ret, gnu_base),
+                                build_cst_from_int (comp_type,
+                                                    Udigits_Ptr[Idx]));
       else
        for (Idx++, Length--; Length; Idx++, Length--)
-         gnu_ret = fold (build2 (PLUS_EXPR, comp_type,
-                                 fold (build2 (MULT_EXPR, comp_type,
-                                               gnu_ret, gnu_base)),
-                                 build_cst_from_int (comp_type,
-                                                     Udigits_Ptr[Idx])));
+         gnu_ret = fold_build2 (PLUS_EXPR, comp_type,
+                                fold_build2 (MULT_EXPR, comp_type,
+                                             gnu_ret, gnu_base),
+                                build_cst_from_int (comp_type,
+                                                    Udigits_Ptr[Idx]));
     }
 
   gnu_ret = convert (type, gnu_ret);