diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cef86bc436f..2f17a0a3b9b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-26  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR target/87439
+	* config/i386/i386.h (NUM_MODES_FOR_MODE_SWITCHING): Update
+	for removed I387_MASK_PM entity.
+
 2018-09-26  Jeff Law  <law@redhat.com>
 
 	Revert
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index b68fc801718..f96f864b810 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -2499,7 +2499,7 @@ enum avx_u128_state
 
 #define NUM_MODES_FOR_MODE_SWITCHING			\
   { X86_DIRFLAG_ANY, AVX_U128_ANY,			\
-    I387_CW_ANY, I387_CW_ANY, I387_CW_ANY, I387_CW_ANY }
+    I387_CW_ANY, I387_CW_ANY, I387_CW_ANY }
 
 
 /* Avoid renaming of stack registers, as doing so in combination with