From patchwork Wed Apr 4 20:52:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Ellcey X-Patchwork-Id: 150803 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 8573CB702A for ; Thu, 5 Apr 2012 06:52:34 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1334177555; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Date:From:Message-Id:To:Subject:Reply-to:Mime-Version: Content-Type:Content-Transfer-Encoding:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=enZ72sTYCBa2uYrmrfPTr8YAF88=; b=lfNnC4SqUzBw2co oa4GP4P3MzDO/Y4C9ikDcXTdMAgw6mobLxhSXHgXdR1agvEYX4IGdFgzJN+5totz jatAs1cBL/oBKXQRcsvNWGQHB1N8ow9GTIKeLvzZBtKpL6S2DYxZ5+tr83DPTsNw 5gDmlqiiiS1+qAawkGPbmSkrSRoI= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Date:From:Message-Id:To:Subject:Reply-to:Mime-Version:Content-Type:Content-Transfer-Encoding:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=L31S4HHE6jO5KLicactStbvIqF5G8KmoV49T/lN6OvGvo3NkBSCt4gqkO7DUvb 4f1LRmQLLm7g6HyIvG6/lAixd8maE51OLkJiKGPoMziF7dhD49Kwm++QKVqJFOAi sqHKYRwGzO1uR7q+HMUOW50OSgcsByNkO7/+VhloKZK0A=; Received: (qmail 1583 invoked by alias); 4 Apr 2012 20:52:32 -0000 Received: (qmail 1568 invoked by uid 22791); 4 Apr 2012 20:52:31 -0000 X-SWARE-Spam-Status: No, hits=-4.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_YE, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from g4t0014.houston.hp.com (HELO g4t0014.houston.hp.com) (15.201.24.17) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 04 Apr 2012 20:52:19 +0000 Received: from g4t0018.houston.hp.com (g4t0018.houston.hp.com [16.234.32.27]) by g4t0014.houston.hp.com (Postfix) with ESMTP id 43D4B243FF for ; Wed, 4 Apr 2012 20:52:16 +0000 (UTC) Received: from adlwrk05.cce.hp.com (adlwrk05.cce.hp.com [16.85.100.124]) by g4t0018.houston.hp.com (Postfix) with ESMTP id 2CFFC100EF for ; Wed, 4 Apr 2012 20:52:16 +0000 (UTC) Received: (from sje@localhost) by adlwrk05.cce.hp.com (8.11.1 (PHNE_35951)/8.7.3 TIS Messaging 5.0) id q34KqFd23791 for gcc-patches@gcc.gnu.org; Wed, 4 Apr 2012 13:52:15 -0700 (PDT) Date: Wed, 4 Apr 2012 13:52:15 -0700 (PDT) From: Steve Ellcey Message-Id: <201204042052.q34KqFd23791@adlwrk05.cce.hp.com> To: gcc-patches@gcc.gnu.org Subject: [patch, committed, backport] Backport IA64 patch to 4.6 branch Reply-to: sje@cup.hp.com Mime-Version: 1.0 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 I had a request to backport this patch to the 4.6 branch and since it is an obvious fix and hasn't caused any problems on the main line I have gone ahead and checked it in. I tested the patch on the 4.6 branch with IA64 HP-UX and had no regressions. FYI: Friday will be my last day at HP but I will be starting at MIPS next week and working on GCC. I will change my email address in the MAINTAINERS file after I start at MIPS. Steve Ellcey sje@cup.hp.com 2012-04-04 Steve Ellcey Backported from mainline. * decl.c (cxx_init_decl_processing): Use ptr_mode instead of Pmode. Index: decl.c =================================================================== --- decl.c (revision 186141) +++ decl.c (working copy) @@ -3636,7 +3636,7 @@ cxx_init_decl_processing (void) TYPE_SIZE_UNIT (nullptr_type_node) = size_int (GET_MODE_SIZE (ptr_mode)); TYPE_UNSIGNED (nullptr_type_node) = 1; TYPE_PRECISION (nullptr_type_node) = GET_MODE_BITSIZE (ptr_mode); - SET_TYPE_MODE (nullptr_type_node, Pmode); + SET_TYPE_MODE (nullptr_type_node, ptr_mode); record_builtin_type (RID_MAX, "decltype(nullptr)", nullptr_type_node); nullptr_node = build_int_cst (nullptr_type_node, 0); }