From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date: Wed, 21 Dec 2016 09:35:57 +0000 (+0000)
Subject: iresolve.c (gfc_resolve_ftell): Call "ftell" instead of "ftell2".
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f7db9ebf2b793ee115d572267b8c97362f43575c;p=gcc.git

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

	* 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
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5154b1981eb..e4bc0e8cafc 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 b289c9f6840..a30ed9f3d65 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 26707049e52..2c24253b640 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -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
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);
 }