This patch moves some ChangeLog entries from ChangeLog into
ChangeLog.google-main. This prevents merge conflicts.
Committed to google/main.
Diego.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eddbc67..086d1ba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,22 +1,3 @@
-2011-04-11 Xinliang David Li <davi...@google.com>
-
- * value-profile.c (check_ic_target): New function.
- (gimple_ic_transform): Sanity check indirect call target.
- * gimple-low.c (gimple_check_call_args): Interface change.
- (gimple_check_call_matching_types): New function.
- * tree-inline.c (tree_can_inline_p): Call new function.
-
-2011-04-08 Xinliang David Li <davi...@google.com>
-
- * ipa-cp.c (ipcp_update_profiling): Correct
- negative scale factor due to insane profile data.
-
-2011-04-08 Xinliang David Li <davi...@google.com>
-
- * final.c (dump_basic_block_info): New function.
- (final): Dump basic block.
- (final_scan_insn): Remove old dump.
-
2011-03-14 Richard Guenther <rguent...@suse.de>
PR middle-end/48098
diff --git a/gcc/ChangeLog.google-main b/gcc/ChangeLog.google-main
index cb4594f..589605a 100644
--- a/gcc/ChangeLog.google-main
+++ b/gcc/ChangeLog.google-main
@@ -1,3 +1,22 @@
+2011-04-11 Xinliang David Li <davi...@google.com>
+
+ * value-profile.c (check_ic_target): New function.
+ (gimple_ic_transform): Sanity check indirect call target.
+ * gimple-low.c (gimple_check_call_args): Interface change.
+ (gimple_check_call_matching_types): New function.
+ * tree-inline.c (tree_can_inline_p): Call new function.
+
+2011-04-08 Xinliang David Li <davi...@google.com>
+
+ * ipa-cp.c (ipcp_update_profiling): Correct
+ negative scale factor due to insane profile data.
+
+2011-04-08 Xinliang David Li <davi...@google.com>
+
+ * final.c (dump_basic_block_info): New function.
+ (final): Dump basic block.
+ (final_scan_insn): Remove old dump.
+
2011-03-29 Le-Chun Wu <l...@google.com>
Merge from branches/annotalysis at r171529.
--
This patch is available for review at http://codereview.appspot.com/4427046
