diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc56822af4d0932df674308b291f67719c261f2e..6c749d2cc3d68e9017dcc84d85b26581d89f3162 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-09-09  Jakub Jelinek  <jakub@redhat.com>
 
+	PR target/87853
+	* config/i386/emmintrin.h (_mm_cmpeq_epi8): Use casts to __v16qi
+	instead of __v16qs.
+
 	PR target/91704
 	* config/i386/avxintrin.h (__v32qs): New typedef.
 	* config/i386/avx2intrin.h (_mm256_cmpgt_epi8): Use casts to __v32qs
diff --git a/gcc/config/i386/emmintrin.h b/gcc/config/i386/emmintrin.h
index f9e7b33b0ddf49b932bce29089382bd72c4c586f..1683d842c651f97101b3d4ba0e5622132bb06228 100644
--- a/gcc/config/i386/emmintrin.h
+++ b/gcc/config/i386/emmintrin.h
@@ -1308,7 +1308,7 @@ _mm_xor_si128 (__m128i __A, __m128i __B)
 extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _mm_cmpeq_epi8 (__m128i __A, __m128i __B)
 {
-  return (__m128i) ((__v16qs)__A == (__v16qs)__B);
+  return (__m128i) ((__v16qi)__A == (__v16qi)__B);
 }
 
 extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d1c448a3a078d2683830445a3b12b4420133ea05..ec2872b97df9708d5b7301cc1f83bc4655cd93ca 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2019-09-09  Jakub Jelinek  <jakub@redhat.com>
 
+	PR target/87853
+	* gcc.target/i386/pr87853.c: New test.
+
 	PR target/91704
 	* gcc.target/i386/pr91704.c: New test.
 
diff --git a/gcc/testsuite/gcc.target/i386/pr87853.c b/gcc/testsuite/gcc.target/i386/pr87853.c
new file mode 100644
index 0000000000000000000000000000000000000000..9a288879679abd7d9205c6a2209fdc861bc59dca
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr87853.c
@@ -0,0 +1,20 @@
+/* PR target/87853 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -funsigned-char -msse2 -mno-sse3 -masm=att" } */
+/* { dg-final { scan-assembler-times "\tpcmpgtb\t%xmm" 2 } } */
+/* { dg-final { scan-assembler-not "\tpsubusb\t" } } */
+/* { dg-final { scan-assembler-not "\tpcmpeqb\t" } } */
+
+#include <x86intrin.h>
+
+__m128i
+foo (__m128i x, __m128i y)
+{
+  return _mm_cmpgt_epi8 (x, y);
+}
+
+__m128i
+bar (__m128i x, __m128i y)
+{
+  return _mm_cmplt_epi8 (x, y);
+}