diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d5616524c0d..28f64ed3e19 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-09  Martin Liska  <mliska@suse.cz>
+
+	* fold-const-call.c (fold_const_call): Fix up type of s0 and s1.
+
 2016-11-09  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/77718
diff --git a/gcc/fold-const-call.c b/gcc/fold-const-call.c
index 38f9717f139..e2d0eaf0228 100644
--- a/gcc/fold-const-call.c
+++ b/gcc/fold-const-call.c
@@ -1506,7 +1506,8 @@ tree
 fold_const_call (combined_fn fn, tree type, tree arg0, tree arg1, tree arg2)
 {
   const char *p0, *p1;
-  size_t s0, s1, s2 = 0;
+  unsigned HOST_WIDE_INT s0, s1;
+  size_t s2 = 0;
   switch (fn)
     {
     case CFN_BUILT_IN_STRNCMP: