summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-21 13:08:39 +0000
committernickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-21 13:08:39 +0000
commit0f284b75afbf6aeb00c2cd79ddd7e9dd3a7306b5 (patch)
tree280525c6a31b77814c5d05d2e208620ce079e8a1
parent3c619a6deee4fbd8438d40dd51ee543290be1c78 (diff)
downloadppe42-gcc-0f284b75afbf6aeb00c2cd79ddd7e9dd3a7306b5.tar.gz
ppe42-gcc-0f284b75afbf6aeb00c2cd79ddd7e9dd3a7306b5.zip
Oops - forgot to include ChangeLog entry for m32r patch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96796 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e16a3125bee..2baf95e003a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -248,6 +248,7 @@
scale_bbs_frequencies_int.
* tree-ssa-loop-ch.c (copy_loop_headers): Fix profiling info.
+>>>>>>> 2.7929
2005-03-18 Kazu Hirata <kazu@cs.umass.edu>
* config/m32r/m32r-protos.h: Remove the prototypes for
OpenPOWER on IntegriCloud