From patchwork Sat Aug 31 15:15:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 271538 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 CN "www.sourceware.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 789562C009A for ; Sun, 1 Sep 2013 01:16:08 +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:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=TCZYIyR72/AaaxgyU lHpRtIpPUktQ9rAoEzKg7XiHaWDn2VfCqp3bxm3ny6VTweu0d98P71pHcbO67EHU L0mIyzrRGN0P7eIN2vdrC7bHvT2oSwp1mDzaoDJSKGR1yWW+qiGM3uOVRqM6HLr6 BIldYpOBBmIef7QpsC6rM2Ta00= 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:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=default; bh=8kKBelMrf7b6gpkwQVQyaE1 DHPY=; b=g6WykIWNyNhG/+IyagnZyfbPJ937H3eDCiNKM3vDaS1VAmMRBDQra6K Wci6oxMGnyY9OJxNvybkCD0yjUQ9SfLDfv2TJvZ4IhtklMTx9JnQ+Rls68I1lzSB 3f/x2mRzU0CtUm1FueySANj7E7UNK8ub1AGaVHT0XVuRwmAZN0tA= Received: (qmail 25467 invoked by alias); 31 Aug 2013 15:16:01 -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 25457 invoked by uid 89); 31 Aug 2013 15:16:01 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 31 Aug 2013 15:16:01 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7VFFxFZ016645 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 31 Aug 2013 11:15:59 -0400 Received: from redhat.com (ovpn-116-91.ams2.redhat.com [10.36.116.91]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r7VFFuBA016111 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 31 Aug 2013 11:15:58 -0400 Date: Sat, 31 Aug 2013 17:15:55 +0200 From: Marek Polacek To: David Edelsohn Cc: GCC Patches Subject: Re: Ubsan merged into trunk Message-ID: <20130831151555.GI23899@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) On Fri, Aug 30, 2013 at 06:58:06PM -0400, David Edelsohn wrote: > This patch / merge broke bootstrap on AIX: > > In file included from ./tm.h:18:0, > from /home/dje/src/src/gcc/function.h:26, > from /home/dje/src/src/gcc/basic-block.h:25, > from /home/dje/src/src/gcc/cgraph.h:28, > from /home/dje/src/src/gcc/ubsan.c:25: > /home/dje/src/src/gcc/ubsan.c: In function 'tree_node* > ubsan_type_descriptor(tree)': > /home/dje/src/src/gcc/config/rs6000/xcoff.h:262:63: error: > 'rs6000_xcoff_strip_dollar' was not declared in this scope > sprintf (LABEL, "*%s..%u", rs6000_xcoff_strip_dollar (PREFIX), > (unsigned) (NUM)) > ^ > /home/dje/src/src/gcc/ubsan.c:282:3: note: in expansion of macro > 'ASM_GENERATE_INTERNAL_LABEL' > ASM_GENERATE_INTERNAL_LABEL (tmp_name, "Lubsan_type", type_var_id_num++); > ^ > /home/dje/src/src/gcc/ubsan.c: In function 'tree_node* > ubsan_create_data(const char*, location_t, ...)': > /home/dje/src/src/gcc/config/rs6000/xcoff.h:262:63: error: > 'rs6000_xcoff_strip_dollar' was not declared in this scope > sprintf (LABEL, "*%s..%u", rs6000_xcoff_strip_dollar (PREFIX), > (unsigned) (NUM)) > > If you use macros like ASM_GENERATE_INTERNAL_LABEL, which may cal > target-specific functions, you need to include tm_p.h to pull in > -protos.h. I see, sorry. Will commit the following fix as obvious in a bit. 2013-08-31 Marek Polacek * ubsan.c: Include tm_p.h. Marek --- gcc/ubsan.c.mp 2013-08-31 17:12:48.719219402 +0200 +++ gcc/ubsan.c 2013-08-31 17:13:05.895281454 +0200 @@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. #include "hashtab.h" #include "pointer-set.h" #include "output.h" +#include "tm_p.h" #include "toplev.h" #include "ubsan.h" #include "c-family/c-common.h"