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

2003-12-21  Gabriel Dos Reis <gdr@integrable-solutions.net>

    Backport from mainline:
    2003-10-31  Richard Earnshaw  <rearnsha@arm.com>

            PR target/11271
            * reload.c (find_reloads_address): Handle any register in
            (PLUS (PLUS (REG) (REG)) (CONST_INT).

From-SVN: r74915

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f9e10903373cf1396282fb9512200403503f95f9..57c16f5436c93e6070d0a431807fee7b92d9031d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-21  Gabriel Dos Reis <gdr@integrable-solutions.net>    
+
+    Backport from mainline:    
+    2003-10-31  Richard Earnshaw  <rearnsha@arm.com>
+
+           PR target/11271
+           * reload.c (find_reloads_address): Handle any register in
+           (PLUS (PLUS (REG) (REG)) (CONST_INT).
+
 2003-12-21  Roger Sayle  <roger@eyesopen.com>
 
        PR middle-end/13400

diff --git a/gcc/reload.c b/gcc/reload.c
index b151af738538bdff6284b27048c0b254ac25ecc2..13a10ac8687a8eec732c7eaf3b1ff0583ccab16c 100644 (file)
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -4873,7 +4873,6 @@ 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),
@@ -4893,7 +4892,6 @@ 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),