diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/iresolve.c | 2 | ||||
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/gfortran.map | 1 | ||||
| -rw-r--r-- | libgfortran/io/intrinsics.c | 22 |
5 files changed, 13 insertions, 22 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5154b19..e4bc0e8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2016-12-21 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + * iresolve.c (gfc_resolve_ftell): Call "ftell" instead of "ftell2". + 2016-12-20 Janne Blomqvist <jb@gcc.gnu.org> * trans-types.c (gfc_init_types): Don't redefine boolean type node. diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index b289c9f..a30ed9f 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -2604,7 +2604,7 @@ gfc_resolve_ftell (gfc_expr *f, gfc_expr *u) gfc_convert_type (u, &ts, 2); } - f->value.function.name = gfc_get_string (PREFIX ("ftell2")); + f->value.function.name = gfc_get_string (PREFIX ("ftell")); } diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 2670704..2c24253 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,5 +1,11 @@ 2016-12-21 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + * gfortran.map: Remove _gfortran_ftell2. + * io/intrinsics.c (ftell): Remove. + (ftell2): Rename to ftell. + +2016-12-21 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + * gfortran.map: Move all _gfortran_* __iso_c_binding_* symbols to GFORTRAN_7. Rename F2C_1.0 to GFORTRAN_F2C_7. Move all C99 compatibility symbols to GFORTRAN_C99_7. diff --git a/libgfortran/gfortran.map b/libgfortran/gfortran.map index cddb88a..460bfe4 100644 --- a/libgfortran/gfortran.map +++ b/libgfortran/gfortran.map @@ -257,7 +257,6 @@ GFORTRAN_7 { _gfortran_fstat_i4_sub; _gfortran_fstat_i8; _gfortran_fstat_i8_sub; - _gfortran_ftell2; _gfortran_ftell; _gfortran_ftell_i1_sub; _gfortran_ftell_i2_sub; diff --git a/libgfortran/io/intrinsics.c b/libgfortran/io/intrinsics.c index 5bf08f3..ad8e28b 100644 --- a/libgfortran/io/intrinsics.c +++ b/libgfortran/io/intrinsics.c @@ -272,29 +272,11 @@ gf_ftell (int unit) } -/* Here is the ftell function with an incorrect return type; retained - due to ABI compatibility. */ - -extern size_t PREFIX(ftell) (int *); +extern GFC_IO_INT PREFIX(ftell) (int *); export_proto_np(PREFIX(ftell)); -size_t -PREFIX(ftell) (int * unit) -{ - return gf_ftell (*unit); -} - - -/* Here is the ftell function with the correct return type, ensuring - that large files can be supported as long as the target supports - large integers; as of 4.8 the FTELL intrinsic function will call - this one instead of the old ftell above. */ - -extern GFC_IO_INT PREFIX(ftell2) (int *); -export_proto_np(PREFIX(ftell2)); - GFC_IO_INT -PREFIX(ftell2) (int * unit) +PREFIX(ftell) (int * unit) { return gf_ftell (*unit); } |