From patchwork Wed Oct 22 15:19:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 402180 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 24C59140080 for ; Thu, 23 Oct 2014 02:19:20 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; q=dns; s=default; b=rrgYQUcLnB+gjKJX /c/o3KYZWWexA9CB2ys4k85wrAeLXdz502D34GJFe79zNESV1QgzL9KNLP+IOY43 vfVnTFuhEsIUPx7wxkhjgJo1zYEvSn6pZvFVVRGJ9qgGf1nvy5+GBeKOFRVQrxLf dh9skcFUrZyF9XkqPkydI8t4cH4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; s=default; bh=o48q+wsAOQt/RvuGXAlGCY kS6dw=; b=vNqp60SH8Lm8nTTfslNq7RlQIqxkwERz3VNMrifiROuqHbR70lzAed i0IBU09IZWvj4Xyuvrb3w0hxWyue+xZts3CUZ5J8x1IrY2yGCjI+UveH9ioRJ6Am w5lyEuQmyjnQCdBkeEqk6a/dn0g7qbILXFQUnr0j10dwkfbAZGXYg= Received: (qmail 23240 invoked by alias); 22 Oct 2014 15:19:12 -0000 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 Received: (qmail 23224 invoked by uid 89); 22 Oct 2014 15:19:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp-relay.CeBiTec.Uni-Bielefeld.DE Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 22 Oct 2014 15:19:11 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 370F9255; Wed, 22 Oct 2014 17:19:09 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id MiCpHbLUAD1f; Wed, 22 Oct 2014 17:19:07 +0200 (CEST) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.110]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 49738254; Wed, 22 Oct 2014 17:19:07 +0200 (CEST) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.14.7+Sun/8.14.7/Submit) id s9MFJ6G9002889; Wed, 22 Oct 2014 17:19:06 +0200 (CEST) From: Rainer Orth To: Dehao Chen Cc: Jan Hubicka , GCC Patches , David Li Subject: Re: [PATCH] AutoFDO patch for trunk References: <20140515210430.GB29194@kam.mff.cuni.cz> <20141014150215.GA25780@kam.mff.cuni.cz> <20141015142840.GB11581@atrey.karlin.mff.cuni.cz> <20141019095826.GB14852@kam.mff.cuni.cz> Date: Wed, 22 Oct 2014 17:19:06 +0200 In-Reply-To: (Dehao Chen's message of "Mon, 20 Oct 2014 14:21:19 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Dehao Chen writes: > The updated patch attached. Will commit the patch in 2~3 hours if no > objection is received. Apart from the AIX bootstrap failure your patch introduced, it also breaks Solaris bootstrap: In file included from ./config.h:6:0, from /vol/gcc/src/hg/trunk/local/gcc/auto-profile.c:25: ./auto-host.h:1976:0: error: "_FILE_OFFSET_BITS" redefined [-Werror] #define _FILE_OFFSET_BITS 64 ^ In file included from /usr/include/iso/string_iso.h:24:0, from /usr/include/string.h:11, from /vol/gcc/src/hg/trunk/local/gcc/auto-profile.c:21: /var/gcc/regression/trunk/11-gcc/build/prev-gcc/include-fixed/sys/feature_tests.h:213:0: note: this is the location of the previous definition #define _FILE_OFFSET_BITS 32 ^ As Joseph is repeating over and over again, *nothing* must be included before config.h, and auto-profile.c violates this. The following patch at least allows the file to compile without errors; no idea if this the best order for the headers involved. Rainer diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c --- a/gcc/auto-profile.c +++ b/gcc/auto-profile.c @@ -18,12 +18,13 @@ You should have received a copy of the G along with GCC; see the file COPYING3. If not see . */ +#include "config.h" +#include "system.h" + #include #include #include -#include "config.h" -#include "system.h" #include "coretypes.h" #include "tree.h" #include "tree-pass.h"