diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index f37850c4505..2c7b3f1e00f 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-22  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	PR libfortran/83070
+	* intrinsics/eoshift0.c (eoshift0): Fix -Wsign-compare warning by
+	making a_ex and r_ex index_type instead of size_t.
+
 2017-11-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/78549
diff --git a/libgfortran/intrinsics/eoshift0.c b/libgfortran/intrinsics/eoshift0.c
index 24a23c30fda..3dae88c3757 100644
--- a/libgfortran/intrinsics/eoshift0.c
+++ b/libgfortran/intrinsics/eoshift0.c
@@ -107,7 +107,7 @@ eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
   if (which > 0)
     {
       /* Test if both ret and array are contiguous.  */
-      size_t r_ex, a_ex;
+      index_type r_ex, a_ex;
       r_ex = 1;
       a_ex = 1;
       do_blocked = true;