OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iresolve.c (gfc_resolve_ftell): Call "ftell" instead of "ftell2".

Browse Source 
* iresolve.c (gfc_resolve_ftell): Call "ftell" instead of "ftell2".

	* gfortran.map: Remove _gfortran_ftell2.
	* io/intrinsics.c (ftell): Remove.
	(ftell2): Rename to ftell.

From-SVN: r243841
This commit is contained in:
Francois-Xavier Coudert 2016-12-21 09:35:57 +00:00 committed by François-Xavier Coudert
parent 84ab8b8ad5
commit f7db9ebf2b
5 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/fortran/ChangeLog
View File

@ -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.

2
gcc/fortran/iresolve.c
View File

@ -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"));
}

6
libgfortran/ChangeLog
View File

@ -1,3 +1,9 @@
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

1
libgfortran/gfortran.map
View File

@ -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;

22
libgfortran/io/intrinsics.c
View File

@ -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);
}