diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 37e9b6d1b04..3b91864c1e9 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -3950,7 +3950,7 @@
   if (GET_CODE (addr) != REG && HALF_PIC_P () && !CONSTANT_ADDRESS_P (addr))
     XEXP (operands[0], 0) = force_reg (Pmode, addr);
 
-  if (! call_insn_operand (operands[0], QImode))
+  if (! expander_call_insn_operand (operands[0], QImode))
     operands[0]
       = change_address (operands[0], VOIDmode,
 			copy_to_mode_reg (Pmode, XEXP (operands[0], 0)));
@@ -3999,7 +3999,7 @@
   if (GET_CODE (addr) != REG && HALF_PIC_P () && !CONSTANT_ADDRESS_P (addr))
     XEXP (operands[0], 0) = force_reg (Pmode, addr);
 
-  if (! call_insn_operand (operands[0], QImode))
+  if (! expander_call_insn_operand (operands[0], QImode))
     operands[0]
       = change_address (operands[0], VOIDmode,
 			copy_to_mode_reg (Pmode, XEXP (operands[0], 0)));
@@ -4052,7 +4052,7 @@
   if (GET_CODE (addr) != REG && HALF_PIC_P () && !CONSTANT_ADDRESS_P (addr))
     XEXP (operands[1], 0) = force_reg (Pmode, addr);
 
-  if (! call_insn_operand (operands[1], QImode))
+  if (! expander_call_insn_operand (operands[1], QImode))
     operands[1]
       = change_address (operands[1], VOIDmode,
 			copy_to_mode_reg (Pmode, XEXP (operands[1], 0)));
@@ -4106,7 +4106,7 @@
   if (GET_CODE (addr) != REG && HALF_PIC_P () && !CONSTANT_ADDRESS_P (addr))
     XEXP (operands[1], 0) = force_reg (Pmode, addr);
 
-  if (! call_insn_operand (operands[1], QImode))
+  if (! expander_call_insn_operand (operands[1], QImode))
     operands[1]
       = change_address (operands[1], VOIDmode,
 			copy_to_mode_reg (Pmode, XEXP (operands[1], 0)));
@@ -4159,7 +4159,7 @@
     XEXP (operands[0], 0) = force_reg (Pmode, addr);
 
   operands[1] = change_address (operands[1], DImode, XEXP (operands[1], 0));
-  if (! call_insn_operand (operands[1], QImode))
+  if (! expander_call_insn_operand (operands[1], QImode))
     operands[1]
       = change_address (operands[1], VOIDmode,
 			copy_to_mode_reg (Pmode, XEXP (operands[1], 0)));