diff options
| author | Franz Sirl <sirl@gcc.gnu.org> | 2000-10-17 23:26:18 +0000 |
|---|---|---|
| committer | Franz Sirl <sirl@gcc.gnu.org> | 2000-10-17 23:26:18 +0000 |
| commit | 2b7fb034237232c10493fe9942a1a7709ea3d5ce (patch) | |
| tree | 690ef04a50b1cf57d88be8b20f0f9232d9a915bf /gcc | |
| parent | 1a2ebe6d5750d7f65d800530181bdeead7787a43 (diff) | |
| download | gcc-2b7fb034237232c10493fe9942a1a7709ea3d5ce.zip gcc-2b7fb034237232c10493fe9942a1a7709ea3d5ce.tar.gz gcc-2b7fb034237232c10493fe9942a1a7709ea3d5ce.tar.bz2 | |
* ChangeLog: Remove CVS conflict marker, fix typos.
From-SVN: r36916
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a56ad45..0c0fe8b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,10 +1,10 @@ 2000-10-17 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * function.c (locate_and_pad_parm): Don't align stack unconditionally. - Fixes execute/20001017-1.c on pwerpc-linux-gnu. + Fixes execute/20001017-1.c on powerpc-linux-gnu. * expr.c (store_constructor): Apply MEM_ALIAS_SET to MEMs only. - * rs6000/rs6000.c (rs6000_hash_constant): use X0INT to access a + * rs6000/rs6000.c (rs6000_hash_constant): Use X0INT to access a LABEL_REF. * rs6000/rs6000.h (NO_DOLLAR_IN_LABEL, DOLLARS_IN_IDENTIFIERS, @@ -102,7 +102,6 @@ to be used along with -shared, and document the subtle failure that may occur otherwise. ->>>>>>> 1.7984 2000-10-16 J. David Anglin <dave@hiauly1.hia.nrc.ca> * pa.md (return_internal): Move `use' after `return'. |