2009-06-03 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>

            Tobias Burnus  <burnus@net-b.de>

        * iso-c-binding.def: Use INTMAX_TYPE instead of
        * intmax_type_node.
        * trans-types.c (init_c_interop_kinds): Remove intmax_type_node.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148145 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5653041..9bed6a3 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-03  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+           Tobias Burnus  <burnus@net-b.de>
+
+       * iso-c-binding.def: Use INTMAX_TYPE instead of intmax_type_node.
+       * trans-types.c (init_c_interop_kinds): Remove intmax_type_node.
+
 2009-06-03  Alexandre Oliva  <aoliva@redhat.com>
 
        * module.c (mio_f2k_derived): Initialize cur.

diff --git a/gcc/fortran/iso-c-binding.def b/gcc/fortran/iso-c-binding.def
index 94c12fd..2879776 100644 (file)
--- a/gcc/fortran/iso-c-binding.def
+++ b/gcc/fortran/iso-c-binding.def
@@ -54,7 +54,7 @@ NAMED_INTCST (ISOCBINDING_LONG_LONG, "c_long_long", \
               get_int_kind_from_node (long_long_integer_type_node), GFC_STD_F2003)
 
 NAMED_INTCST (ISOCBINDING_INTMAX_T, "c_intmax_t", \
-              get_int_kind_from_node (intmax_type_node), GFC_STD_F2003)
+              get_int_kind_from_name (INTMAX_TYPE), GFC_STD_F2003)
 NAMED_INTCST (ISOCBINDING_INTPTR_T, "c_intptr_t", \
               get_int_kind_from_name (INTPTR_TYPE), GFC_STD_F2003)
 NAMED_INTCST (ISOCBINDING_SIZE_T, "c_size_t", \

diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index 0c43993..2e6889b 100644 (file)
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -285,11 +285,6 @@ static
 void init_c_interop_kinds (void)
 {
   int i;
-  tree intmax_type_node = INT_TYPE_SIZE == LONG_LONG_TYPE_SIZE ?
-                         integer_type_node :
-                         (LONG_TYPE_SIZE == LONG_LONG_TYPE_SIZE ?
-                          long_integer_type_node :
-                          long_long_integer_type_node);
 
   /* init all pointers in the list to NULL */
   for (i = 0; i < ISOCBINDING_NUMBER; i++)