From patchwork Mon May 13 21:55:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Kosnik X-Patchwork-Id: 243543 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 8A3B32C009F for ; Tue, 14 May 2013 07:56:06 +1000 (EST) 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=ckkxBzE1DnYYhRue6KdiFg0hIGOv2qZUI/ypSqjAeR68BN0kEc3iD OSE4RnnoWZ9Goz6EzQtWM46u3f04wxsVP00rCD8Ic9ly1QHU+EqnoLM6Q1vBlgLR KFPOrmJqK4SSRoNf6Bglp17U6iMPVDkzzrAo0ck7qUsQwCk5BjBfOs= 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=+cdqFvs9rJnyLgU12OleCGVPINs=; b=H/SPPffRjVPI+maKCrnk A3CHHaUjptzcy7w1Zuc8Tf3SiWXbj73EaRL5hMHlvcnxNGbnAFQqycarFEElJ10+ Nk6zAZqAu+uQGVb5Mre8oJcY3N5KtBnBs3//c2mLLB7RUhWBRxkViX0Oq63wqM+W DBvyuUSV0zeA2YJEOBBbYSo= Received: (qmail 4095 invoked by alias); 13 May 2013 21:56:00 -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 4080 invoked by uid 89); 13 May 2013 21:56:00 -0000 X-Spam-SWARE-Status: No, score=-6.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 X-Spam-User: qpsmtpd, 2 recipients Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 13 May 2013 21:55:59 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4DLtw0d006937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 May 2013 17:55:58 -0400 Received: from oakwood (ovpn-113-166.phx2.redhat.com [10.3.113.166]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r4DLtuJF008065; Mon, 13 May 2013 17:55:56 -0400 Date: Mon, 13 May 2013 14:55:55 -0700 From: Benjamin De Kosnik To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [v3] libsupc++ bad_array_* build fixes Message-ID: <20130513145555.0ef1a2bf@oakwood> Mime-Version: 1.0 X-Virus-Found: No Some cleanup, no Makefile.am was checked in on the bad_array_* additions. The exports make the intent very clear, so this just fills in the blanks. tested x86/linux -benjamin 2013-05-13 Benjamin Kosnik * libsupc++/Makefile.am (sources): Add bad_array_length.cc, bad_array_new.cc. * libsupc++/Makefile.in: Regenerate. * libsupc++/bad_array_length.cc: Tweak. * libsupc++/bad_array_new.cc: Tweak. diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 25c58fb..b4e86f5 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -48,6 +48,8 @@ sources = \ atexit_arm.cc \ atexit_thread.cc \ bad_alloc.cc \ + bad_array_length.cc \ + bad_array_new.cc \ bad_cast.cc \ bad_typeid.cc \ class_type_info.cc \ @@ -107,6 +109,21 @@ cp-demangle.o: cp-demangle.c # Use special rules for the C++11 sources so that the proper flags are passed. +bad_array_length.lo: bad_array_length.cc + $(LTCXXCOMPILE) -std=gnu++11 -c $< +bad_array_length.o: bad_array_length.cc + $(CXXCOMPILE) -std=gnu++11 -c $< + +bad_array_new.lo: bad_array_new.cc + $(LTCXXCOMPILE) -std=gnu++11 -c $< +bad_array_new.o: bad_array_new.cc + $(CXXCOMPILE) -std=gnu++11 -c $< + +eh_aux_runtime.lo: eh_aux_runtime.cc + $(LTCXXCOMPILE) -std=gnu++11 -c $< +eh_aux_runtime.o: eh_aux_runtime.cc + $(CXXCOMPILE) -std=gnu++11 -c $< + eh_ptr.lo: eh_ptr.cc $(LTCXXCOMPILE) -std=gnu++11 -c $< eh_ptr.o: eh_ptr.cc diff --git a/libstdc++-v3/libsupc++/bad_array_length.cc b/libstdc++-v3/libsupc++/bad_array_length.cc index a63d660..76afd30 100644 --- a/libstdc++-v3/libsupc++/bad_array_length.cc +++ b/libstdc++-v3/libsupc++/bad_array_length.cc @@ -23,14 +23,13 @@ #include -namespace std { +namespace std +{ bad_array_length::~bad_array_length() _GLIBCXX_USE_NOEXCEPT { } const char* bad_array_length::what() const _GLIBCXX_USE_NOEXCEPT -{ - return "std::bad_array_length"; -} +{ return "std::bad_array_length"; } } // namespace std diff --git a/libstdc++-v3/libsupc++/bad_array_new.cc b/libstdc++-v3/libsupc++/bad_array_new.cc index 5282f52..224e4f7 100644 --- a/libstdc++-v3/libsupc++/bad_array_new.cc +++ b/libstdc++-v3/libsupc++/bad_array_new.cc @@ -23,14 +23,13 @@ #include -namespace std { +namespace std +{ bad_array_new_length::~bad_array_new_length() _GLIBCXX_USE_NOEXCEPT { } const char* bad_array_new_length::what() const _GLIBCXX_USE_NOEXCEPT -{ - return "std::bad_array_new_length"; -} +{ return "std::bad_array_new_length"; } } // namespace std