diff options
| author | Aldy Hernandez <aldyh@gcc.gnu.org> | 2002-03-21 23:16:17 +0000 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@gcc.gnu.org> | 2002-03-21 23:16:17 +0000 |
| commit | 18523b2c8ec990617ecd4b22be3e4da5b34a0215 (patch) | |
| tree | f39d383dc34286a81d0970177ecca25032db602e /gcc | |
| parent | 2cb921f417450d570773b217b30c3e37c4307585 (diff) | |
| download | gcc-18523b2c8ec990617ecd4b22be3e4da5b34a0215.zip gcc-18523b2c8ec990617ecd4b22be3e4da5b34a0215.tar.gz gcc-18523b2c8ec990617ecd4b22be3e4da5b34a0215.tar.bz2 | |
fix conflicts
From-SVN: r51147
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 67d1cd5..f70bed8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -376,7 +376,6 @@ Tue Mar 19 14:12:32 2002 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> (movqi): Use gen_lowpart in place of gen_rtx_SUBREG. Replace gen_rtx (SUBREG) with gen_rtx_SUBREG. ->>>>>>> 1.13452 2002-03-18 Aldy Hernandez <aldyh@redhat.com> * config/rs6000/rs6000.h (PREDICATE_CODES): Add PARALLEL to |