aboutsummaryrefslogtreecommitdiff
path: root/gcc/ChangeLog
diff options
context:
space:
mode:
authorKenneth Zadeck <zadeck@gcc.gnu.org>2007-06-19 21:07:29 +0000
committerKenneth Zadeck <zadeck@gcc.gnu.org>2007-06-19 21:07:29 +0000
commit4aa0f91154fea25a5434fa68943da765246b2914 (patch)
treea58eeafd856f06c0aac853f7acb84d17446a4634 /gcc/ChangeLog
parent670a8526bcc1f6c3330e27cb248a2208e616fa3f (diff)
downloadgcc-4aa0f91154fea25a5434fa68943da765246b2914.zip
gcc-4aa0f91154fea25a5434fa68943da765246b2914.tar.gz
gcc-4aa0f91154fea25a5434fa68943da765246b2914.tar.bz2
forgot to save back Changelog
From-SVN: r125860
Diffstat (limited to 'gcc/ChangeLog')
-rw-r--r--gcc/ChangeLog5
1 files changed, 1 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 32754f5..61f6833 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,4 @@
-<<<<<<< .mine
-2007-06-15 Kenneth Zadeck <zadeck@naturalbridge.com>
+2007-06-19 Kenneth Zadeck <zadeck@naturalbridge.com>
* df.h (DF_FIRST_OPTIONAL_PROBLEM): Removed.
(struct df_problem.free_blocks_on_set_blocks): New field.
@@ -51,7 +50,6 @@
* init-regs.c (initialize_uninitialized_regs): Make sure df_live
is there at -O == 1.
-=======
2007-06-19 Seongbae Park <seongbae.park@gmail.com>
* config/arm/arm.c (arm_get_frame_offsets): Set
@@ -98,7 +96,6 @@
* config/frv/frv.c (frv_ifcvt_modify_tests): Dataflow merge fix.
(frv_ifcvt_modify_insn): Likewise.
->>>>>>> .r125856
2007-06-19 Richard Guenther <rguenther@suse.de>
* tree-ssa-structalias.c (handle_ptr_arith): Make sure to