From 6520ecacd5060c7ba33f1f4fb54f1ad5cca2ece1 Mon Sep 17 00:00:00 2001 From: Janne Blomqvist Date: Fri, 27 Jul 2007 21:13:37 +0300 Subject: [PATCH] Fortran frontend changelog: 2007-07-27 Janne Blomqvist * trans-io.c (gfc_build_io_library_fndecls): Change to use gfc_array_index_type for array descriptor triplets instead of gfc_int4_type_node. libgfortran ChangeLog: 2007-07-27 Janne Blomqvist * io/transfer.c (st_set_nml_var_dim): Use index_type instead of GFC_INTEGER_4 for array descriptor triplets. From-SVN: r126992 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-io.c | 4 ++-- libgfortran/ChangeLog | 5 +++++ libgfortran/io/transfer.c | 14 +++++++------- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1a17c5194053..79571fdc48c3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-07-27 Janne Blomqvist + + * trans-io.c (gfc_build_io_library_fndecls): Change to use + gfc_array_index_type for array descriptor triplets instead of + gfc_int4_type_node. + 2007-07-26 Steven G. Kargl PR fortran/32899 diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c index 4b708713e72f..adc7bc175de9 100644 --- a/gcc/fortran/trans-io.c +++ b/gcc/fortran/trans-io.c @@ -417,8 +417,8 @@ gfc_build_io_library_fndecls (void) iocall[IOCALL_SET_NML_VAL_DIM] = gfc_build_library_function_decl (get_identifier (PREFIX("st_set_nml_var_dim")), void_type_node, 5, dt_parm_type, - gfc_int4_type_node, gfc_int4_type_node, - gfc_int4_type_node, gfc_int4_type_node); + gfc_int4_type_node, gfc_array_index_type, + gfc_array_index_type, gfc_array_index_type); } diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index c0a81fa475c9..374040d018d4 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2007-07-27 Janne Blomqvist + + * io/transfer.c (st_set_nml_var_dim): Use index_type instead of + GFC_INTEGER_4 for array descriptor triplets. + 2007-07-27 Francois-Xavier Coudert * io/unix.c (stream_ttyname): Mark argument as potentialy unused. diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 067a065f9cfc..3feae04df59e 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -2906,14 +2906,14 @@ st_set_nml_var (st_parameter_dt *dtp, void * var_addr, char * var_name, /* Store the dimensional information for the namelist object. */ extern void st_set_nml_var_dim (st_parameter_dt *, GFC_INTEGER_4, - GFC_INTEGER_4, GFC_INTEGER_4, - GFC_INTEGER_4); + index_type, index_type, + index_type); export_proto(st_set_nml_var_dim); void st_set_nml_var_dim (st_parameter_dt *dtp, GFC_INTEGER_4 n_dim, - GFC_INTEGER_4 stride, GFC_INTEGER_4 lbound, - GFC_INTEGER_4 ubound) + index_type stride, index_type lbound, + index_type ubound) { namelist_info * nml; int n; @@ -2922,9 +2922,9 @@ st_set_nml_var_dim (st_parameter_dt *dtp, GFC_INTEGER_4 n_dim, for (nml = dtp->u.p.ionml; nml->next; nml = nml->next); - nml->dim[n].stride = (ssize_t)stride; - nml->dim[n].lbound = (ssize_t)lbound; - nml->dim[n].ubound = (ssize_t)ubound; + nml->dim[n].stride = stride; + nml->dim[n].lbound = lbound; + nml->dim[n].ubound = ubound; } /* Reverse memcpy - used for byte swapping. */