Backport a change to the 2.95 branch

From-SVN: r37880

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fa7d9cc60be1f7aa500ab277aaeab643e99e78d8..b62d66afea9039f36c3971fbc8c1ed402f3c7ecb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2000-11-30  Bernd Schmidt  <bernds@redhat.co.uk>
 
+       Tue Oct 26 00:41:54 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+       * reload1.c (reload_reg_free_for_value_p): Show
+       RELOAD_FOR_OTHER_ADDRESS reloads can conflict with RELOAD_OTHER
+        reloads.
+
        2000-02-26  Geoff Keating  <geoffk@cygnus.com>
        * reload1.c (do_output_reload): Check reg_reloaded_valid before
        looking at reg_reloaded_contents.

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 4730caaed6c807e52561da96584fc92ea3ce65c2..e96ae0fbcad07eca0634b040e6f650cc7c253cb6 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -5235,7 +5235,8 @@ reload_reg_free_for_value_p (regno, opnum, type, value, out, reloadnum,
   switch (type)
     {
     case RELOAD_FOR_OTHER_ADDRESS:
-      time1 = 0;
+      /* RELOAD_FOR_OTHER_ADDRESS conflicts with RELOAD_OTHER reloads.  */
+      time1 = copy ? 0 : 1;
       break;
     case RELOAD_OTHER:
       time1 = copy ? 1 : MAX_RECOG_OPERANDS * 5 + 5;