diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 33cc32ff90e..a0e9093ff32 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-18  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.md (*<code>extend<mode>xf2): Macroize insn from
+	*<code>extendsfxf2 and *<code>extenddfxf2 using MODEF mode iterator.
+
 2018-09-18  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR other/87353
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 869ff5930eb..e08b2b7c14b 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -9837,19 +9837,10 @@
   [(set_attr "type" "fsgn")
    (set_attr "mode" "DF")])
 
-(define_insn "*<code>extendsfxf2"
+(define_insn "*<code>extend<mode>xf2"
   [(set (match_operand:XF 0 "register_operand" "=f")
 	(absneg:XF (float_extend:XF
-		     (match_operand:SF 1 "register_operand" "0"))))]
-  "TARGET_80387"
-  "f<absneg_mnemonic>"
-  [(set_attr "type" "fsgn")
-   (set_attr "mode" "XF")])
-
-(define_insn "*<code>extenddfxf2"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-	(absneg:XF (float_extend:XF
-		     (match_operand:DF 1 "register_operand" "0"))))]
+		     (match_operand:MODEF 1 "register_operand" "0"))))]
   "TARGET_80387"
   "f<absneg_mnemonic>"
   [(set_attr "type" "fsgn")