From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-419872-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 98027 invoked by alias); 23 Jan 2016 07:30:15 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Received: (qmail 97869 invoked by uid 89); 23 Jan 2016 07:30:06 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 spammy=HContent-Transfer-Encoding:8bit
X-HELO: mx2.suse.de
Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Sat, 23 Jan 2016 07:30:05 +0000
Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254])	by mx2.suse.de (Postfix) with ESMTP id A74B2AAC1;	Sat, 23 Jan 2016 07:29:59 +0000 (UTC)
User-Agent: K-9 Mail for Android
In-Reply-To: <20160122221538.GC3017@tucnak.redhat.com>
References: <alpine.LSU.2.20.1601211731160.25099@wotan.suse.de> <CAMe9rOrFPERszwXYbe3J+XzzNaHYzKH96R4TrTGos8+vH7gLtA@mail.gmail.com> <20160122202348.GX3017@tucnak.redhat.com> <20160122221538.GC3017@tucnak.redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Subject: Re: Speedup configure and build with system.h
From: Richard Biener <rguenther@suse.de>
Date: Sat, 23 Jan 2016 07:30:00 -0000
To: Jakub Jelinek <jakub@redhat.com>,Jeff Law <law@redhat.com>
CC: Michael Matz <matz@suse.de>,GCC Patches <gcc-patches@gcc.gnu.org>
Message-ID: <A731C4C7-6631-46C5-85F3-1C6F41696D86@suse.de>
X-SW-Source: 2016-01/txt/msg01802.txt.bz2

On January 22, 2016 11:15:38 PM GMT+01:00, Jakub Jelinek <jakub@redhat.com> wrote:
>On Fri, Jan 22, 2016 at 09:23:48PM +0100, Jakub Jelinek wrote:
>> On Fri, Jan 22, 2016 at 12:09:43PM -0800, H.J. Lu wrote:
>> > >         * system.h (string, algorithm): Include only
>conditionally.
>> > >         (new): Include always under C++.
>> > >         * bb-reorder.c (toplevel): Define USES_ALGORITHM.
>> > >         * final.c (toplevel): Ditto.
>> > >         * ipa-chkp.c (toplevel): Define USES_STRING.
>> > >         * genconditions.c (write_header): Make gencondmd.c define
>> > >         USES_STRING.
>> > >         * mem-stats.h (mem_usage::print_dash_line): Don't use
>std::string.
>> > >
>> > 
>> > This may have caused:
>> > 
>> > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69434
>> 
>> Guess we need:
>> 
>> 2016-01-22  Jakub Jelinek  <jakub@redhat.com>
>> 
>> 	PR bootstrap/69434
>> 	* genrecog.c: Define INCLUDE_ALGORITHM before including system.h,
>> 	remove <algorithm> include.
>
>Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

OK.

Richard.

>> --- gcc/genrecog.c.jj	2016-01-04 18:50:33.207491883 +0100
>> +++ gcc/genrecog.c	2016-01-22 21:21:42.852362294 +0100
>> @@ -105,6 +105,7 @@
>>     5. Write out C++ code for each function.  */
>>  
>>  #include "bconfig.h"
>> +#define INCLUDE_ALGORITHM
>>  #include "system.h"
>>  #include "coretypes.h"
>>  #include "tm.h"
>> @@ -112,7 +113,6 @@
>>  #include "errors.h"
>>  #include "read-md.h"
>>  #include "gensupport.h"
>> -#include <algorithm>
>>  
>>  #undef GENERATOR_FILE
>>  enum true_rtx_doe {
>
>	Jakub