From patchwork Mon Sep 16 11:01:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 275184 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9A23D2C00F2 for ; Mon, 16 Sep 2013 21:01:50 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; q=dns; s=default; b=FvwDffZTBKZFot6rLE VuEBK1++nKI1Wy8GyemmX17GLZAXFahoUmo+Cgr+QcgOD7NS1Z0598FwnDWdbBPX J6DnJLTT6AjLwa3Tzup5+mhIVPzjxjhVr2CpKM4fMVHM3F6k8C4dVbs369Nx9+56 hsRz9gPiZwg58mkRJh+BD2kDU= 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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; s=default; bh=8dtpanZ4kXIxLIxlapCq4qvB wmY=; b=B7Zz8LjS7EyV6KYvztRDQC5ZXWUpJGGnC0ke7Aphyv8m1EVLVq13rpY0 UxjeIU0UJkRK5rmbc1Y7ET8rAod8uVgtTRJQ6v9Bj3eqvNowggcytbxYCamMAvqy iqMzWvRh43zFZaaFLmE3F6QqATJjOxlR1eZoxBXIc0WSmJnZ3Dk= Received: (qmail 15688 invoked by alias); 16 Sep 2013 11:01:43 -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 15677 invoked by uid 89); 16 Sep 2013 11:01:43 -0000 Received: from mail-ob0-f179.google.com (HELO mail-ob0-f179.google.com) (209.85.214.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 16 Sep 2013 11:01:43 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KHOP_THREADED, NO_RELAYS autolearn=ham version=3.3.2 X-HELO: mail-ob0-f179.google.com Received: by mail-ob0-f179.google.com with SMTP id wn1so3743856obc.10 for ; Mon, 16 Sep 2013 04:01:40 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.182.22.226 with SMTP id h2mr25270671obf.8.1379329300666; Mon, 16 Sep 2013 04:01:40 -0700 (PDT) Received: by 10.182.137.136 with HTTP; Mon, 16 Sep 2013 04:01:40 -0700 (PDT) In-Reply-To: References: Date: Mon, 16 Sep 2013 13:01:40 +0200 Message-ID: Subject: Re: [buildrobot] [PATCH] r202527: ssa / ssanames restructure broke alpha-linux From: Uros Bizjak To: "gcc-patches@gcc.gnu.org" Cc: Jan-Benedict Glaw , Richard Biener On Mon, Sep 16, 2013 at 11:06 AM, Uros Bizjak wrote: >> My Build Robot[1] found this recent commit to break Alpha: >> >> * tree-flow.h (FREE_SSANAMES): Move to tree-ssanames.c >> (SSANAMES, MODIFIED_NORETURN_CALLS, DEFAULT_DEFS, ptr_info_def, >> num_ssa_names, ssa_name): Move to tree-ssanames.h + prototypes. >> * tree-flow-inline.h (make_ssa_name, copy_ssa_name, duplicate_ssa_name, >> make_temp_ssa_name): move to tree-ssanames.h >> * tree-ssa-alias.h: Move prototype. >> * tree-ssa.h: Include tree-ssanames.h. >> * tree-ssanames.c (FREE_SSANAMES): Move to here. >> * tree-ssanames.h: New. Move items from tree-flow*.h >> * Makefile.in (tree-ssanames.h): Add to tree-ssanames.o and GTFILES. >> >> See for example this build log: >> http://toolchain.lug-owl.de/buildbot/showlog.php?id=11663&mode=view >> >> I suggest this patch, which fixes an alpha-linux build for me: >> >> 2013-09-13 Jan-Benedict Glaw >> >> * config/alpha.c: Include tree-ssa.h. > > Thanks, I have tested the patch and commit it to the mainline to > restore bootstrap. Richi noted that: I think you can remove the tree-flow.h include and you need to update the dependencies in gcc/Makefile.in. However, we still need tree-flow.h, but instead of tree-ssa.h, we can include tree-ssanames.h: I will commit attached incremental patch, once bootstrap finish. Uros. Index: alpha.c =================================================================== --- alpha.c (revision 202621) +++ alpha.c (working copy) @@ -50,7 +50,7 @@ #include "splay-tree.h" #include "gimple.h" #include "tree-flow.h" -#include "tree-ssa.h" +#include "tree-ssanames.h" #include "tree-stdarg.h" #include "tm-constrs.h" #include "df.h"