aboutsummaryrefslogtreecommitdiff
path: root/libgfortran/io
diff options
context:
space:
mode:
authorJanne Blomqvist <jb@gcc.gnu.org>2012-06-21 21:47:01 +0300
committerJanne Blomqvist <jb@gcc.gnu.org>2012-06-21 21:47:01 +0300
commit67eb28c8b8081b781c04e368766dab06fa13ed15 (patch)
tree59aa2323ea68faca7af3c3ce061a65ad40e8ebb7 /libgfortran/io
parent5175cbafd2640d15304558c02e66642aa94e34b5 (diff)
downloadgcc-67eb28c8b8081b781c04e368766dab06fa13ed15.zip
gcc-67eb28c8b8081b781c04e368766dab06fa13ed15.tar.gz
gcc-67eb28c8b8081b781c04e368766dab06fa13ed15.tar.bz2
PR 39654 FTELL intrinsic function return type.
frontend ChangeLog: 2012-06-21 Janne Blomqvist <jb@gcc.gnu.org> PR fortran/39654 * iresolve.c (gfc_resolve_ftell): Fix result kind and use new library function. library ChangeLog: 2012-06-21 Janne Blomqvist <jb@gcc.gnu.org> PR fortran/39654 * io/intrinsics.c (ftell2): New function. * gfortran.map (_gfortran_ftell2): Export function. From-SVN: r188858
Diffstat (limited to 'libgfortran/io')
-rw-r--r--libgfortran/io/intrinsics.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/libgfortran/io/intrinsics.c b/libgfortran/io/intrinsics.c
index 576434a..9abadae 100644
--- a/libgfortran/io/intrinsics.c
+++ b/libgfortran/io/intrinsics.c
@@ -272,6 +272,10 @@ gf_ftell (int unit)
return ret;
}
+
+/* Here is the ftell function with an incorrect return type; retained
+ due to ABI compatibility. */
+
extern size_t PREFIX(ftell) (int *);
export_proto_np(PREFIX(ftell));
@@ -281,6 +285,22 @@ 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)
+{
+ return gf_ftell (*unit);
+}
+
+
#define FTELL_SUB(kind) \
extern void ftell_i ## kind ## _sub (int *, GFC_INTEGER_ ## kind *); \
export_proto(ftell_i ## kind ## _sub); \