1853c1853,1854
< "TARGET_64BIT && (flow2_completed || (reload_completed && !flag_peephole2))
---
> "TARGET_64BIT && ((optimize > 0 && flag_peephole2)
> ? flow2_completed : reload_completed)
2108c2109,2110
< "TARGET_64BIT && (flow2_completed || (reload_completed && !flag_peephole2))
---
> "TARGET_64BIT && ((optimize > 0 && flag_peephole2)
> ? flow2_completed : reload_completed)
2175,2176c2177
< && GET_CODE (XEXP (operands[1], 0)) == SYMBOL_REF
< && CONSTANT_POOL_ADDRESS_P (XEXP (operands[1], 0))"
---
> && constant_pool_reference_p (operands[1])"
2179c2180
< "operands[1] = get_pool_constant (XEXP (operands[1], 0));")
---
> "operands[1] = avoid_constant_pool_reference (operands[1]);")
2892,2893c2893
< && GET_CODE (XEXP (operands[1], 0)) == SYMBOL_REF
< && CONSTANT_POOL_ADDRESS_P (XEXP (operands[1], 0))"
---
> && constant_pool_reference_p (operands[1])"
2896c2896
< rtx c = get_pool_constant (XEXP (operands[1], 0));
---
> rtx c = avoid_constant_pool_reference (operands[1]);