re PR rtl-optimization/11271 ([arm-elf] regex.c ICEs for thumb multilib)

        PR target/11271
        * reload.c: Revert last backport from mainline.  It breaks
        s390.

From-SVN: r74924

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1e7cee20b7055dc4b348f6ca29922f9a6e370f8b..508ebf5eaa1ff815e4a2937dde1839e0279b32ee 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-22  Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+        PR target/11271
+       * reload.c: Revert last backport from mainline.  It breaks s390. 
+
 2003-12-21  Roger Sayle  <roger@eyesopen.com>
 
        * config/ia64/hpux.h (TARGET_OS_CPP_BUILTINS): Define _ILP32

diff --git a/gcc/reload.c b/gcc/reload.c
index 13a10ac8687a8eec732c7eaf3b1ff0583ccab16c..b151af738538bdff6284b27048c0b254ac25ecc2 100644 (file)
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -4873,6 +4873,7 @@ find_reloads_address (mode, memrefloc, ad, loc, opnum, type, ind_levels, insn)
           && GET_CODE (XEXP (ad, 0)) == PLUS
           && GET_CODE (XEXP (XEXP (ad, 0), 0)) == REG
           && REGNO (XEXP (XEXP (ad, 0), 0)) < FIRST_PSEUDO_REGISTER
+          && REG_MODE_OK_FOR_BASE_P (XEXP (XEXP (ad, 0), 0), mode)
           && ! maybe_memory_address_p (mode, ad, &XEXP (XEXP (ad, 0), 1)))
     {
       *loc = ad = gen_rtx_PLUS (GET_MODE (ad),
@@ -4892,6 +4893,7 @@ find_reloads_address (mode, memrefloc, ad, loc, opnum, type, ind_levels, insn)
           && GET_CODE (XEXP (ad, 0)) == PLUS
           && GET_CODE (XEXP (XEXP (ad, 0), 1)) == REG
           && REGNO (XEXP (XEXP (ad, 0), 1)) < FIRST_PSEUDO_REGISTER
+          && REG_MODE_OK_FOR_BASE_P (XEXP (XEXP (ad, 0), 1), mode)
           && ! maybe_memory_address_p (mode, ad, &XEXP (XEXP (ad, 0), 0)))
     {
       *loc = ad = gen_rtx_PLUS (GET_MODE (ad),