diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c6b3167ac0c..84f4c5a6e32 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-25  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	PR bootstrap/87417
+	* rtl.c (rtx_code_size): Take into account that EQ_ATTR_ALT
+	contains HOST_WIDE_INTs when computing its size.
+
 2018-09-24  Jim Wilson  <jimw@sifive.com>
 
 	PR target/87391
diff --git a/gcc/rtl.c b/gcc/rtl.c
index f9146afcf2c..ca5c25c422f 100644
--- a/gcc/rtl.c
+++ b/gcc/rtl.c
@@ -110,8 +110,7 @@ const enum rtx_class rtx_class[NUM_RTX_CODE] = {
 
 const unsigned char rtx_code_size[NUM_RTX_CODE] = {
 #define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS)				\
-  (((ENUM) == CONST_INT || (ENUM) == CONST_DOUBLE			\
-    || (ENUM) == CONST_FIXED || (ENUM) == CONST_WIDE_INT)		\
+  ((FORMAT)[0] == 'w'							\
    ? RTX_HDR_SIZE + (sizeof FORMAT - 1) * sizeof (HOST_WIDE_INT)	\
    : (ENUM) == REG							\
    ? RTX_HDR_SIZE + sizeof (reg_info)					\