From patchwork Thu Aug 16 18:29:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Novillo X-Patchwork-Id: 178070 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 DDF3A2C0093 for ; Fri, 17 Aug 2012 04:29:45 +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=1345746586; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Message-ID:Date:From:User-Agent:MIME-Version: To:CC:Subject:References:In-Reply-To:Content-Type: Content-Transfer-Encoding:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=lrM/oCaa1dDvEwND0p4pCkR0YT8=; b=Qj+rG2AFJVU1KcO gehHX9wu/TmiNxxAPE1aBFsdX8TTYUxVt/dzJ+AswMeo4oDlgZtCQY3tsuoU6x8O kH0nzjVzCBhtG/oSpzMaBJILJtTfhuHtl3XXgIei19rW9Qq7X95HzBOEXEK81cNL sAU8CZOhVkn0oCmTvQgJvnCxMamg= 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:X-Google-DKIM-Signature:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=SKhXEBu9qjiwno2UXXoESMwDbXQXt/uLgvkUqpZqZPbOZY6/NNpDoHfh5rYKgP BvE3G7xKIvFFYzl2WaXOuxm59veGG/od4/JIbNU1Iz19+eakxHFKKkWGlUPEuIQM dD8eCKPUHGsrUzZ9bcDZhh3U5vo/ZSNNf9Vcnq6lzrH78=; Received: (qmail 12361 invoked by alias); 16 Aug 2012 18:29:37 -0000 Received: (qmail 12353 invoked by uid 22791); 16 Aug 2012 18:29:36 -0000 X-SWARE-Spam-Status: No, hits=-5.7 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail-yx0-f175.google.com (HELO mail-yx0-f175.google.com) (209.85.213.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 16 Aug 2012 18:29:23 +0000 Received: by yenm1 with SMTP id m1so3391647yen.20 for ; Thu, 16 Aug 2012 11:29:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:organization:user-agent:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding:x-gm-message-state; bh=gQFI81esYZsdrsobb025y1Plg/iHMQo+o5rUV1TghE4=; b=ELfo4S8lcvgRei/SRZIc8T3evsrbzcmcDHQ3Wp+XrZvZh07BpMKfiqN9PWeA7rjL9o zyaFs0QvG/+yo0/cdD56oYnVnvkWl+1fZwi8vbBxd+/BfO1OAWDrKayyyZiQX32Kfk69 FNV5SIvRDs15jgiIBckFxrVyZ7rhbQqBQyCttA+3fR42NsOGcR9Hbb2rfDJLXqSU7N6c at9a8lQR92fNnoWtu31AgWB3rVG54LGG3SjIeeEjDULVK1uCpZx9FZfkXFRxijKRvLiv kHhXhTegzv7lFT4X2e4l7Tft4wtcu2I884JyM9fDcxTZ9Cbx4Z2C+5f6CclekXl9iXsV 0ttw== Received: by 10.236.108.202 with SMTP id q50mr2735223yhg.6.1345141762749; Thu, 16 Aug 2012 11:29:22 -0700 (PDT) Received: by 10.236.108.202 with SMTP id q50mr2735200yhg.6.1345141762588; Thu, 16 Aug 2012 11:29:22 -0700 (PDT) Received: from dnovillo-macbookpro.local ([172.26.41.229]) by mx.google.com with ESMTPS id e24sm9686291yhh.4.2012.08.16.11.29.21 (version=SSLv3 cipher=OTHER); Thu, 16 Aug 2012 11:29:21 -0700 (PDT) Message-ID: <502D3C00.30707@google.com> Date: Thu, 16 Aug 2012 14:29:20 -0400 From: Diego Novillo User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: Magnus Fromreide CC: gcc-patches@gcc.gnu.org, Richard Guenther , "Iyer, Balaji V" Subject: Re: [bootstrap] Tentative fix for PR 54281 References: <20120816115551.GA13453@google.com> <20120816175027.GA20994@bacon.lysator.liu.se> In-Reply-To: <20120816175027.GA20994@bacon.lysator.liu.se> X-Gm-Message-State: ALoCoQmIpY3R0UDz7qdshbshEWelhm2iGHGQMsI6FRgJwRQLiAww2EQX/CtchZ10qLEPhO9fkSynslEya9zKPUoaee+PdGZqlkiBzg2dAiWu8qcOYZ7EYD1iDaZWTP2u1aQ2IYY7VwoMk29vheQKckxr0AKp3OCsJeg2unGEJrLbt+Pm9zd/J16VxJxOyjRM7MqhD6KviTHp X-IsSubscribed: yes 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 have reverted my original fix and propose this one. My fix caused build failures in Ada (which includes system.h inside 'extern "C"' blocks) and it also breaks in-tree isl/cloog. Richi, I've tried building my own 4.1, but it doesn't build on my system. Could you try this patch? It includes libintl.h before undefining the names, this way the inclusion done from gmp.h turns into a nop. Thanks. Diego. commit 96e3d8108901c6f94fa3b0f2de769370688836cb Author: Diego Novillo Date: Thu Aug 16 14:27:49 2012 -0400 2012-08-16 Diego Novillo PR bootstrap/54281 * intl.h: Always include libintl.h. diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8ff00d..5252122 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2012-08-16 Diego Novillo + PR bootstrap/54281 + * intl.h: Always include libintl.h. + +2012-08-16 Diego Novillo + Revert PR bootstrap/54281 diff --git a/gcc/intl.h b/gcc/intl.h index c4db354..745fefd 100644 --- a/gcc/intl.h +++ b/gcc/intl.h @@ -27,8 +27,8 @@ # define setlocale(category, locale) (locale) #endif -#ifdef ENABLE_NLS #include +#ifdef ENABLE_NLS extern void gcc_init_libintl (void); extern size_t gcc_gettext_width (const char *); #else