aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/dojump.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d169440..5a53bc9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-21 Andrew Pinski <pinskia@gcc.gnu.org>
+
+ * dojump.c (prefer_and_bit_test): Fix which part of
+ the and_test is replaced.
+
2004-03-21 Joseph S. Myers <jsm@polyomino.org.uk>
* frontends.texi: Add missing line.
@@ -274,7 +279,6 @@
* config/rs6000/rs6000.h: Definition of DWARF_CIE_DATA_ALIGNMENT
macro for mixed mode.
->>>>>>> 2.3203
2004-03-18 Jan Hubicka <jh@suse.cz>
* predict.c (propagate_freq): Compute correctly frequency of
diff --git a/gcc/dojump.c b/gcc/dojump.c
index 83af19b..09a13d9 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -135,7 +135,7 @@ prefer_and_bit_test (enum machine_mode mode, int bitnum)
}
/* Fill in the integers. */
- XEXP (and_test, 0) = GEN_INT ((unsigned HOST_WIDE_INT) 1 << bitnum);
+ XEXP (and_test, 1) = GEN_INT ((unsigned HOST_WIDE_INT) 1 << bitnum);
XEXP (XEXP (shift_test, 0), 1) = GEN_INT (bitnum);
return (rtx_cost (and_test, IF_THEN_ELSE)