Backport a change to the 2.95 branch

From-SVN: r37884

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f602db0bdbe6c4180d96357c1aeabd86e441cf0a..607a0a6e3e32ec3b502b34e46342e9ab3edfd505 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2000-11-30  Bernd Schmidt  <bernds@redhat.co.uk>
 
+       1999-11-29  Joern Rennecke  <amylaar@redhat.co.uk>
+       * reload1.c (reloads_conflict): Reverse test comparing operand
+       numbers when testing for conflict between output/outaddr reloads.
+
        2000-07-12  Richard Henderson  <rth@redhat.com>
        * reload.c (push_secondary_reload): Make sure to add the new
        reload at the end, after acquiring secondary memory.

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 40869372c9bff08a18dc1d323e5f4d2f58101a46..c57670663fe66fd42e180216db6519fd6feea06c 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -5136,7 +5136,7 @@ reloads_conflict (r1, r2)
       return (r2_type == RELOAD_FOR_INSN || r2_type == RELOAD_FOR_OUTPUT
              || ((r2_type == RELOAD_FOR_OUTPUT_ADDRESS
                   || r2_type == RELOAD_FOR_OUTADDR_ADDRESS)
-                 && r2_opnum >= r1_opnum));
+                 && r2_opnum <= r1_opnum));
 
     case RELOAD_FOR_INSN:
       return (r2_type == RELOAD_FOR_INPUT || r2_type == RELOAD_FOR_OUTPUT