From: burnus Date: Wed, 3 Jun 2009 19:44:43 +0000 (+0000) Subject: 2009-06-03 Francois-Xavier Coudert X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f843aad6aae096d90c7ef7bddac6b99ee3702b1;p=thirdparty%2Fgcc.git 2009-06-03 Francois-Xavier Coudert Tobias Burnus * 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 56530417fd5c..9bed6a3180d3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2009-06-03 Francois-Xavier Coudert + Tobias Burnus + + * 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 * module.c (mio_f2k_derived): Initialize cur. diff --git a/gcc/fortran/iso-c-binding.def b/gcc/fortran/iso-c-binding.def index 94c12fd09af6..2879776798aa 100644 --- 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 0c4399371255..2e6889b83543 100644 --- 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++)