From patchwork Wed Jan 28 15:02:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 433887 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B7E99140216 for ; Thu, 29 Jan 2015 02:07:17 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; q=dns; s=default; b=yM4O4DiEIpIjx/9iA1HNURSrGG4L14 8oXAGd9n9SAnP1F6+36ZxCw9v83yNO5/ZA9nhwo6JnJ4vqY1aAeVYA1naL7PGxUo QJr7LV0zQAj8LciQzs5roqA8UsOZhIvctGXDfS4FocHvpYQ98Ih91EUFMHd4D3AA aBAiI6aGnlNhE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; s=default; bh=/Rtp66KigGKMUGp0+IGSibPYw3s=; b=QqJD qMYfEPJamTgz8K83Yjp8ehQmOoyADNsSrc+2H5PWat7abdvz2GfWc3oppUOde6Zh cvKSGUf/UPoEzOB/oDh1M61qJsWxHrRNICojmHnKI7DkwDqH6F9Ve2Ff1580wTdK YrZiUf1HGqbh9GPdXKqBIewMZMoEsCWxcS2I/lo= Received: (qmail 11477 invoked by alias); 28 Jan 2015 15:02:44 -0000 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 Received: (qmail 11430 invoked by uid 89); 28 Jan 2015 15:02:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients 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; Wed, 28 Jan 2015 15:02:37 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0SF2ZgQ032432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 28 Jan 2015 10:02:35 -0500 Received: from localhost (ovpn-116-136.ams2.redhat.com [10.36.116.136]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0SF2Yfv025438; Wed, 28 Jan 2015 10:02:35 -0500 Date: Wed, 28 Jan 2015 15:02:34 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [patch] Fix warning during libstdc++ build Message-ID: <20150128150234.GG3360@redhat.com> References: <20150107224927.GD3360@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150107224927.GD3360@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) On 07/01/15 22:49 +0000, Jonathan Wakely wrote: >This fixes a -Wc++14-compat warning in the new libsupc++/del_ops.cc >file that defines the C++14 sized deallocation function. > >Tested x86_64-linux, committed to trunk. > And another instance of the same warning. Tested x86_64-linux, committed to trunk. commit 3618d497ea61020de59464500c5cf38a52bc690a Author: Jonathan Wakely Date: Wed Jan 28 09:52:53 2015 +0000 PR libstdc++/64828 * libsupc++/Makefile.am: Compile del_opvs.cc as C++14. * libsupc++/Makefile.in: Regenerate. * src/c++11/Makefile.in: Regenerate. diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index aace1a6..b87ffbf 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -182,6 +182,10 @@ del_ops.lo: del_ops.cc $(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< del_ops.o: del_ops.cc $(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< +del_opvs.lo: del_opvs.cc + $(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< +del_opvs.o: del_opvs.cc + $(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< # AM_CXXFLAGS needs to be in each subdirectory so that it can be # modified in a per-library or per-sub-library way. Need to manually diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 50fee54..0ab0417 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -875,6 +875,10 @@ del_ops.lo: del_ops.cc $(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< del_ops.o: del_ops.cc $(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< +del_opvs.lo: del_opvs.cc + $(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< +del_opvs.o: del_opvs.cc + $(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< install-stdHEADERS: $(std_HEADERS) @$(NORMAL_INSTALL) diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index 70d5bd7..12b6346 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -74,10 +74,10 @@ libc__11convenience_la_LIBADD = am__objects_2 = ctype_configure_char.lo ctype_members.lo am__objects_3 = chrono.lo codecvt.lo condition_variable.lo \ cow-stdexcept.lo ctype.lo debug.lo functexcept.lo \ - functional.lo futex.lo future.lo hash_c++0x.lo hashtable_c++0x.lo \ - ios.lo limits.lo mutex.lo placeholders.lo random.lo regex.lo \ - shared_ptr.lo snprintf_lite.lo system_error.lo thread.lo \ - $(am__objects_1) $(am__objects_2) + functional.lo futex.lo future.lo hash_c++0x.lo \ + hashtable_c++0x.lo ios.lo limits.lo mutex.lo placeholders.lo \ + random.lo regex.lo shared_ptr.lo snprintf_lite.lo \ + system_error.lo thread.lo $(am__objects_1) $(am__objects_2) @ENABLE_DUAL_ABI_TRUE@am__objects_4 = cow-fstream-inst.lo \ @ENABLE_DUAL_ABI_TRUE@ cow-sstream-inst.lo cow-string-inst.lo \ @ENABLE_DUAL_ABI_TRUE@ cow-wstring-inst.lo cxx11-locale-inst.lo \