From patchwork Wed Jan 7 22:49:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 426421 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 B792414009B for ; Thu, 8 Jan 2015 09:49:40 +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:mime-version:content-type; q=dns; s= default; b=axQ9O1FIhIe3vsOmXu9T6V3MHP0oPC1fmGnqTZqwFr20MVNb2xhjX xzuPdXzaWgjfiBfq+ydOHK2AD0G/34k5i8hXJ+lC8rcI+oelbG4kfUliyeeQXbD8 wapfhEJapjLxBLrhTy4zLfZ316eZXTZSHmUU5n9LBELAMeBDUtZAKg= 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:mime-version:content-type; s= default; bh=x7rLbJs1MYwOoJoi3tdXGhTLu/o=; b=Oldl2asbcdNgD8wIt3vb gsHSidiyoXsQ7xmH5DaKEeCwpWWnPbrb0y601w3Qw8MD9rWgadZ6zHBgbdEW9b0j djxoPN878cdgREQZYTAcap44vRQwQaweWOsA5KKKdiLab3UhhDB/Somor0wGvRpi W14J8xfgeNuwhUv8AAKwfDk= Received: (qmail 29111 invoked by alias); 7 Jan 2015 22:49:33 -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 29085 invoked by uid 89); 7 Jan 2015 22:49:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, 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, 07 Jan 2015 22:49:31 +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 t07MnT8x003604 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 7 Jan 2015 17:49:29 -0500 Received: from localhost (ovpn-112-20.ams2.redhat.com [10.36.112.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t07MnSGb031616; Wed, 7 Jan 2015 17:49:29 -0500 Date: Wed, 7 Jan 2015 22:49:27 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [patch] Fix warning during libstdc++ build Message-ID: <20150107224927.GD3360@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) 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. commit 9236910f087450f43ce80d696737e9ecd96bb1ef Author: Jonathan Wakely Date: Tue Jan 6 17:30:21 2015 +0000 * libsupc++/Makefile.am: Compile del_ops.cc as C++14. * libsupc++/Makefile.in: Regenerate. diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 06e56b6..aace1a6 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -177,6 +177,12 @@ new_opnt.lo: new_opnt.cc new_opnt.o: new_opnt.cc $(CXXCOMPILE) -std=gnu++11 -c $< +# Use special rules for the C++14 sources so that the proper flags are passed. +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 $< + # 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 # set this option because CONFIG_CXXFLAGS has to be after diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 9a1d725..50fee54 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -870,6 +870,12 @@ new_opnt.lo: new_opnt.cc new_opnt.o: new_opnt.cc $(CXXCOMPILE) -std=gnu++11 -c $< +# Use special rules for the C++14 sources so that the proper flags are passed. +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 $< + install-stdHEADERS: $(std_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(stddir)