From patchwork Wed Nov 14 20:13:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 199008 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 5C52C2C0098 for ; Thu, 15 Nov 2012 07:13:36 +1100 (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=1353528817; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=1V48DFw dFD4WBTpc/T99O7sIKnA=; b=cby6Bk0i6gn9vSv34TVEFfF+EgYMhkMrLzMccuZ 4rDyzGFQTrK7C4t+l3Ex4P8V7ZLhLiOnf0m0NCSskPhCOfjtIza0jy6VAewA3zvT WzGYiZTpmpmRfrX4HKjACkqK1GpLaOzwwBtP9FZ0eFm6N8XNEZA8i3vVzR3c3HzR V9mQ= 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:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=hNFhP/bvNtJaYsXlXrL8HiuGC3FXcNygKYxJdzMdz2y+VzhOLXLcioWGjMVlvY PA0AOzuNcaFOnkADKLuT5cXLq9lTS6vTOqJgkihF0kOCSqLk3MB1fgOyEP1zcS4e bZRSbuAereWYUZ9LVpoRs+YjhoYaS32X+iAKNvdKq0RqE=; Received: (qmail 28261 invoked by alias); 14 Nov 2012 20:13:29 -0000 Received: (qmail 28251 invoked by uid 22791); 14 Nov 2012 20:13:28 -0000 X-SWARE-Spam-Status: No, hits=-6.4 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 14 Nov 2012 20:13:24 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAEKDNaq026116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 15:13:23 -0500 Received: from [10.3.113.62] (ovpn-113-62.phx2.redhat.com [10.3.113.62]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAEKDMqj021545; Wed, 14 Nov 2012 15:13:23 -0500 Message-ID: <50A3FB62.7020301@redhat.com> Date: Wed, 14 Nov 2012 15:13:22 -0500 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: David Edelsohn CC: gcc-patches List Subject: C++ PATCH for c++/37276 (lookup/builtin5.C) on aix 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 This patch fixes the bug in a cross-compiler. I don't remember why I put in that #ifdef in the first place, but it seems incorrect. The other uses of NO_IMPLICIT_EXTERN_C are about allowing () in outdated C headers, which is unrelated. commit b34937b905aa25542da7d6ee3d71db2a1413ddbf Author: Jason Merrill Date: Wed Nov 14 15:10:25 2012 -0500 PR c++/37276 * decl.c (decls_match): Remove #ifdef around earlier fix. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 115c567..045e99b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1017,13 +1017,11 @@ decls_match (tree newdecl, tree olddecl) && DECL_EXTERN_C_P (olddecl))) return 0; -#ifdef NO_IMPLICIT_EXTERN_C /* A new declaration doesn't match a built-in one unless it is also extern "C". */ if (DECL_IS_BUILTIN (olddecl) && DECL_EXTERN_C_P (olddecl) && !DECL_EXTERN_C_P (newdecl)) return 0; -#endif if (TREE_CODE (f1) != TREE_CODE (f2)) return 0;