From patchwork Sat Apr 16 20:16:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Novillo X-Patchwork-Id: 91496 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 84DD4B6F1E for ; Sun, 17 Apr 2011 06:17:12 +1000 (EST) Received: (qmail 3076 invoked by alias); 16 Apr 2011 20:17:10 -0000 Received: (qmail 3068 invoked by uid 22791); 16 Apr 2011 20:17:09 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 16 Apr 2011 20:16:55 +0000 Received: from hpaq13.eem.corp.google.com (hpaq13.eem.corp.google.com [172.25.149.13]) by smtp-out.google.com with ESMTP id p3GKGsUG017637; Sat, 16 Apr 2011 13:16:54 -0700 Received: from tobiano.tor.corp.google.com (tobiano.tor.corp.google.com [172.29.41.6]) by hpaq13.eem.corp.google.com with ESMTP id p3GKGpOY029967; Sat, 16 Apr 2011 13:16:52 -0700 Received: by tobiano.tor.corp.google.com (Postfix, from userid 54752) id 8A397AE18B; Sat, 16 Apr 2011 16:16:51 -0400 (EDT) To: reply@codereview.appspotmail.com, davidxl@google.com, gcc-patches@gcc.gnu.org Subject: [google] Move ChangeLog entries to the right file (issue4427046) Message-Id: <20110416201651.8A397AE18B@tobiano.tor.corp.google.com> Date: Sat, 16 Apr 2011 16:16:51 -0400 (EDT) From: dnovillo@google.com (Diego Novillo) X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This patch moves some ChangeLog entries from ChangeLog into ChangeLog.google-main. This prevents merge conflicts. Committed to google/main. Diego. --- This patch is available for review at http://codereview.appspot.com/4427046 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 - - * 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 - - * ipa-cp.c (ipcp_update_profiling): Correct - negative scale factor due to insane profile data. - -2011-04-08 Xinliang David Li - - * final.c (dump_basic_block_info): New function. - (final): Dump basic block. - (final_scan_insn): Remove old dump. - 2011-03-14 Richard Guenther 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 + + * 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 + + * ipa-cp.c (ipcp_update_profiling): Correct + negative scale factor due to insane profile data. + +2011-04-08 Xinliang David Li + + * final.c (dump_basic_block_info): New function. + (final): Dump basic block. + (final_scan_insn): Remove old dump. + 2011-03-29 Le-Chun Wu Merge from branches/annotalysis at r171529.