diff options
| author | fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-12-21 09:35:57 +0000 |
|---|---|---|
| committer | fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-12-21 09:35:57 +0000 |
| commit | 84f0fbc61901106cef3c088d4a1db17b689bdc57 (patch) | |
| tree | f026989ec1d1cc3ed32ddcbad5415fd04d399551 /libgfortran | |
| parent | 6b9ddad32b381091724ead4a546c4a8d2d553acc (diff) | |
* iresolve.c (gfc_resolve_ftell): Call "ftell" instead of "ftell2".
* gfortran.map: Remove _gfortran_ftell2.
* io/intrinsics.c (ftell): Remove.
(ftell2): Rename to ftell.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@243841 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/gfortran.map | 1 | ||||
| -rw-r--r-- | libgfortran/io/intrinsics.c | 22 |
3 files changed, 8 insertions, 21 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 26707049e52..2c24253b640 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 cddb88a251b..460bfe4965d 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 5bf08f3391a..ad8e28bc4b5 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); } |