From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 93602 invoked by alias); 29 Jan 2016 12:29:50 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 93593 invoked by uid 89); 29 Jan 2016 12:29:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=ds X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 29 Jan 2016 12:29:48 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id B3E0833A89C; Fri, 29 Jan 2016 12:29:47 +0000 (UTC) Received: from localhost (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0TCTkwT022462; Fri, 29 Jan 2016 07:29:47 -0500 Date: Fri, 29 Jan 2016 12:29:00 -0000 From: Jonathan Wakely To: Jakub Jelinek Cc: vogt@linux.vnet.ibm.com, gcc-patches@gcc.gnu.org, Andreas Krebbel Subject: Re: [PATCH] PR c++/69462: Provide FLT_EVAL_METHOD and DECIMAL_DIG in float.h. Message-ID: <20160129122946.GB25169@redhat.com> References: <20160128124012.GA19249@linux.vnet.ibm.com> <20160128133218.GZ15084@redhat.com> <20160128144226.GD3017@tucnak.redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0eh6TmSyL6TZE2Uz" Content-Disposition: inline In-Reply-To: <20160128144226.GD3017@tucnak.redhat.com> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.5.24 (2015-08-30) X-SW-Source: 2016-01/txt/msg02299.txt.bz2 --0eh6TmSyL6TZE2Uz Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 1329 On 28/01/16 15:42 +0100, Jakub Jelinek wrote: >On Thu, Jan 28, 2016 at 01:32:18PM +0000, Jonathan Wakely wrote: >> On 28/01/16 13:40 +0100, Dominik Vogt wrote: >> >The attached patch (written by Jonathan, not me) makes >> >FLT_EVAL_METHOD and DECIMAL_DIG available in C++-11 as they should >> >be. >> > >> >https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69462 >> > >> >Can this be committed (should it wait for stage1)? >> >> I've just noticed we should also do the following, although this can >> definitely wait for stage 1 as it works fine as is (unlike Dominik's >> case which is a conformance bug). >> >> --- a/gcc/ginclude/stdarg.h >> +++ b/gcc/ginclude/stdarg.h >> @@ -47,7 +47,7 @@ typedef __builtin_va_list __gnuc_va_list; >> #define va_start(v,l) __builtin_va_start(v,l) >> #define va_end(v) __builtin_va_end(v) >> #define va_arg(v,l) __builtin_va_arg(v,l) >> -#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L || defined(__GXX_EXPERIMENTAL_CXX0X__) >> +#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L || __cplusplus + 0 >= 201103L >> #define va_copy(d,s) __builtin_va_copy(d,s) >> #endif >> #define __va_copy(d,s) __builtin_va_copy(d,s) > >This is ok, but please fix up the formatting (avoid too long line). I've committed the attached version, wrapping the line. --0eh6TmSyL6TZE2Uz Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 927 commit 92f4d9e8d059d2d1bad1dcea30ec44b60a5c35e7 Author: Jonathan Wakely Date: Fri Jan 29 11:58:17 2016 +0000 Test __cplusplus instead of __GXX_EXPERIMENTAL_CXX0X__ * ginclude/stdarg.h: Test __cplusplus instead of __GXX_EXPERIMENTAL_CXX0X__. diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h index 74a234d..6525152 100644 --- a/gcc/ginclude/stdarg.h +++ b/gcc/ginclude/stdarg.h @@ -47,7 +47,8 @@ typedef __builtin_va_list __gnuc_va_list; #define va_start(v,l) __builtin_va_start(v,l) #define va_end(v) __builtin_va_end(v) #define va_arg(v,l) __builtin_va_arg(v,l) -#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L || defined(__GXX_EXPERIMENTAL_CXX0X__) +#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L \ + || __cplusplus + 0 >= 201103L #define va_copy(d,s) __builtin_va_copy(d,s) #endif #define __va_copy(d,s) __builtin_va_copy(d,s) --0eh6TmSyL6TZE2Uz--