* trans-decl.c (gfc_build_intrinsic_function_decls): Fix

	return type.
	* trans-intrinsic.c (gfc_conv_intrinsic_fdate): Fix argument type.
	(gfc_conv_intrinsic_ttynam): Likewise.
	(gfc_conv_intrinsic_trim): Likewise.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 48dd521..911184b 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-12  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+       * trans-decl.c (gfc_build_intrinsic_function_decls): Fix
+       return type.
+       * trans-intrinsic.c (gfc_conv_intrinsic_fdate): Fix argument type.
+       (gfc_conv_intrinsic_ttynam): Likewise.
+       (gfc_conv_intrinsic_trim): Likewise.
+
 2010-06-12  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/40117

diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 7ebdac4..972d843 100644 (file)
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -2424,26 +2424,26 @@ gfc_build_intrinsic_function_decls (void)
 
   gfor_fndecl_string_len_trim =
     gfc_build_library_function_decl (get_identifier (PREFIX("string_len_trim")),
-                                    gfc_int4_type_node, 2,
+                                    gfc_charlen_type_node, 2,
                                     gfc_charlen_type_node, pchar1_type_node);
 
   gfor_fndecl_string_index =
     gfc_build_library_function_decl (get_identifier (PREFIX("string_index")),
-                                    gfc_int4_type_node, 5,
+                                    gfc_charlen_type_node, 5,
                                     gfc_charlen_type_node, pchar1_type_node,
                                     gfc_charlen_type_node, pchar1_type_node,
                                     gfc_logical4_type_node);
 
   gfor_fndecl_string_scan =
     gfc_build_library_function_decl (get_identifier (PREFIX("string_scan")),
-                                    gfc_int4_type_node, 5,
+                                    gfc_charlen_type_node, 5,
                                     gfc_charlen_type_node, pchar1_type_node,
                                     gfc_charlen_type_node, pchar1_type_node,
                                     gfc_logical4_type_node);
 
   gfor_fndecl_string_verify =
     gfc_build_library_function_decl (get_identifier (PREFIX("string_verify")),
-                                    gfc_int4_type_node, 5,
+                                    gfc_charlen_type_node, 5,
                                     gfc_charlen_type_node, pchar1_type_node,
                                     gfc_charlen_type_node, pchar1_type_node,
                                     gfc_logical4_type_node);

diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 10e0dec..9f63ebf 100644 (file)
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -1329,7 +1329,7 @@ gfc_conv_intrinsic_fdate (gfc_se * se, gfc_expr * expr)
   args = (tree *) alloca (sizeof (tree) * num_args);
 
   var = gfc_create_var (pchar_type_node, "pstr");
-  len = gfc_create_var (gfc_get_int_type (4), "len");
+  len = gfc_create_var (gfc_charlen_type_node, "len");
 
   gfc_conv_intrinsic_function_args (se, expr, &args[2], num_args - 2);
   args[0] = gfc_build_addr_expr (NULL_TREE, var);
@@ -1370,7 +1370,7 @@ gfc_conv_intrinsic_ttynam (gfc_se * se, gfc_expr * expr)
   args = (tree *) alloca (sizeof (tree) * num_args);
 
   var = gfc_create_var (pchar_type_node, "pstr");
-  len = gfc_create_var (gfc_get_int_type (4), "len");
+  len = gfc_create_var (gfc_charlen_type_node, "len");
 
   gfc_conv_intrinsic_function_args (se, expr, &args[2], num_args - 2);
   args[0] = gfc_build_addr_expr (NULL_TREE, var);
@@ -4623,7 +4623,7 @@ gfc_conv_intrinsic_trim (gfc_se * se, gfc_expr * expr)
 
   var = gfc_create_var (gfc_get_pchar_type (expr->ts.kind), "pstr");
   addr = gfc_build_addr_expr (ppvoid_type_node, var);
-  len = gfc_create_var (gfc_get_int_type (4), "len");
+  len = gfc_create_var (gfc_charlen_type_node, "len");
 
   gfc_conv_intrinsic_function_args (se, expr, &args[2], num_args - 2);
   args[0] = gfc_build_addr_expr (NULL_TREE, len);