From patchwork Tue Oct 5 09:42:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 66779 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]) by ozlabs.org (Postfix) with SMTP id A2BB1B6ED0 for ; Tue, 5 Oct 2010 20:43:05 +1100 (EST) Received: (qmail 7375 invoked by alias); 5 Oct 2010 09:43:00 -0000 Received: (qmail 7358 invoked by uid 22791); 5 Oct 2010 09:42:58 -0000 X-SWARE-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL, BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL X-Spam-Check-By: sourceware.org Received: from vsmtp4.tin.it (HELO vsmtp4.tin.it) (212.216.176.224) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 05 Oct 2010 09:42:52 +0000 Received: from [192.168.0.4] (79.33.216.204) by vsmtp4.tin.it (8.5.113) id 4BCE3CBE0C9E4D61; Tue, 5 Oct 2010 11:42:47 +0200 Message-ID: <4CAAF316.50203@gmail.com> Date: Tue, 05 Oct 2010 11:42:46 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6 MIME-Version: 1.0 To: Paolo Carlini CC: Jonathan Wakely , libstdc++ , gcc-patches , Sebastian Huber Subject: Re: [v3] fix libstdc++/44647 References: <4CAAEDEA.6030609@oracle.com> In-Reply-To: <4CAAEDEA.6030609@oracle.com> 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 ... went ahead, and just committed the below. Tested x86_64-linux. Paolo. /////////////// 2010-10-05 Sebastian Huber Jonathan Wakely PR libstdc++/44647 * libsupc++/Makefile.am (sources): Add bad_alloc.cc. * libsupc++/new_handler.cc (bad_alloc): Move to ... * libsupc++/bad_alloc.cc (bad_alloc): ... here, new file. * libsupc++/Makefile.in: Regenerate. Index: libsupc++/bad_alloc.cc =================================================================== --- libsupc++/bad_alloc.cc (revision 0) +++ libsupc++/bad_alloc.cc (revision 0) @@ -0,0 +1,34 @@ +// Implementation file for the -*- C++ -*- dynamic memory management header. + +// Copyright (C) 2010 Free Software Foundation +// +// This file is part of GCC. +// +// GCC is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 3, or (at your option) +// any later version. +// +// GCC is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +#include "new" + +std::bad_alloc::~bad_alloc() throw() { } + +const char* +std::bad_alloc::what() const throw() +{ + return "std::bad_alloc"; +} Index: libsupc++/Makefile.am =================================================================== --- libsupc++/Makefile.am (revision 164966) +++ libsupc++/Makefile.am (working copy) @@ -1,6 +1,7 @@ ## Makefile for the GNU C++ Support library. ## -## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +## 2009, 2010 ## Free Software Foundation, Inc. ## ## Process this file with automake to produce Makefile.in. @@ -43,6 +44,7 @@ sources = \ array_type_info.cc \ atexit_arm.cc \ + bad_alloc.cc \ bad_cast.cc \ bad_typeid.cc \ class_type_info.cc \ Index: libsupc++/new_handler.cc =================================================================== --- libsupc++/new_handler.cc (revision 164966) +++ libsupc++/new_handler.cc (working copy) @@ -1,7 +1,7 @@ // Implementation file for the -*- C++ -*- dynamic memory management header. // Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -// 2005, 2006, 2007, 2009 +// 2005, 2006, 2007, 2008, 2009, 2010 // Free Software Foundation // // This file is part of GCC. @@ -39,11 +39,3 @@ __new_handler = handler; return prev_handler; } - -std::bad_alloc::~bad_alloc() throw() { } - -const char* -std::bad_alloc::what() const throw() -{ - return "std::bad_alloc"; -}