From patchwork Tue Jul 30 15:02:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 263402 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 "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id EF7272C00BC for ; Wed, 31 Jul 2013 01:02:33 +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:subject:message-id:mime-version:content-type; q=dns; s= default; b=MwbELbXsqqtnBPfwmV7O2mKw5LFVvdDKCfC9NzZWkaqhyIztJXm0Z UUJ4ywwjgNCztr+2wawn0YyYExQI7kqUojOdm0whhglMDZV2ya72FS63x+C6R3gj App0Gmz6Z+ZXqh2Yynpins2esbbgAzKzV0YOkV6s5JQgHxT2v7eL0I= 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:subject:message-id:mime-version:content-type; s= default; bh=xqPnHmLMY/sKzVe1Hz6cUi067gM=; b=xjkb0gDdFTs70Brtn7i/ eaFT2EPOgp6/qT3YPp6L3ezRuNWZ2JClXqShQKhcQm4OERFUclsvM3tVwzieTsvt OW/EoGcwntlxEayoRJm41pwfdQt57zBX2VXhQxmzdS4kOf2n7kCy+3LfCV8v+Wkk CbvBL86knanglCAw9zLrh6Y= Received: (qmail 6669 invoked by alias); 30 Jul 2013 15:02:24 -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 6644 invoked by uid 89); 30 Jul 2013 15:02:24 -0000 X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL, BAYES_50, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RDNS_NONE, SPF_HELO_PASS, SPF_PASS autolearn=no version=3.3.1 Received: from Unknown (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 30 Jul 2013 15:02:24 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6UF2G0Z021453 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 30 Jul 2013 11:02:16 -0400 Received: from redhat.com (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6UF2Dak018210 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Tue, 30 Jul 2013 11:02:15 -0400 Date: Tue, 30 Jul 2013 17:02:12 +0200 From: Marek Polacek To: GCC Patches Subject: [ubsan] Rename obsolete variable Message-ID: <20130730150212.GM17022@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Apparently I forgot to check rs6000.h when doing the flag_asan -> flag_sanitize change. This broke bootstrap on ppc. Tested powerpc64-unknown-linux-gnu, applying to ubsan branch. Marek diff --git a/gcc/ChangeLog.ubsan b/gcc/ChangeLog.ubsan index 311a15c..ac584ff 100644 --- a/gcc/ChangeLog.ubsan +++ b/gcc/ChangeLog.ubsan @@ -1,5 +1,10 @@ 2013-07-30 Marek Polacek + * config/rs6000/rs6000.h (FRAME_GROWS_DOWNWARD): Use flag_sanitize + instead of flag_asan. + +2013-07-30 Marek Polacek + * ubsan.c (ubsan_source_location): Use build_constructor_va instead of build_constructor. (ubsan_type_descriptor): Likewise. diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h index e5a6abd..f89b20d 100644 --- a/gcc/config/rs6000/rs6000.h +++ b/gcc/config/rs6000/rs6000.h @@ -1498,7 +1498,8 @@ extern enum reg_class rs6000_constraints[RS6000_CONSTRAINT_MAX]; On the RS/6000, we grow upwards, from the area after the outgoing arguments. */ -#define FRAME_GROWS_DOWNWARD (flag_stack_protect != 0 || flag_asan != 0) +#define FRAME_GROWS_DOWNWARD (flag_stack_protect != 0 \ + || (flag_sanitize & SANITIZE_ADDRESS) != 0) /* Size of the outgoing register save area */ #define RS6000_REG_SAVE ((DEFAULT_ABI == ABI_AIX \