From patchwork Sat Oct 2 11:17:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 66563 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 0F3D4B70E0 for ; Sat, 2 Oct 2010 21:17:46 +1000 (EST) Received: (qmail 18323 invoked by alias); 2 Oct 2010 11:17:41 -0000 Received: (qmail 18302 invoked by uid 22791); 2 Oct 2010 11:17:40 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mail-wy0-f175.google.com (HELO mail-wy0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 02 Oct 2010 11:17:35 +0000 Received: by wyb35 with SMTP id 35so3859041wyb.20 for ; Sat, 02 Oct 2010 04:17:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.216.1.18 with SMTP id 18mr3115745wec.24.1286018251416; Sat, 02 Oct 2010 04:17:31 -0700 (PDT) Received: by 10.216.136.130 with HTTP; Sat, 2 Oct 2010 04:17:31 -0700 (PDT) Date: Sat, 2 Oct 2010 12:17:31 +0100 Message-ID: Subject: [v3] fix libstdc++/44647 From: Jonathan Wakely To: "libstdc++" , gcc-patches Cc: Sebastian Huber 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 http://gcc.gnu.org/PR44647 requests that std::new_handler and std::bad_alloc be put in separate files as this helps reduce code size for embedded code linking to libstdc++.a. I think the request is reasonable so I plan to commit the attached patch to trunk unless I hear objections. PR libstdc++/44647 * libsupc++/Makefile.am (sources): Add bad_alloc.cc. * libsupc++/Makefile.in: Regenerate. * libsupc++/new_handler.cc (bad_alloc): Move to ... * libsupc++/bad_alloc.cc (bad_alloc): * New. Tested x86_64/Linux Index: libsupc++/Makefile.am =================================================================== --- libsupc++/Makefile.am (revision 164901) +++ libsupc++/Makefile.am (working copy) @@ -43,6 +43,7 @@ endif 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 164901) +++ 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, 2009, 2010 // Free Software Foundation // // This file is part of GCC. @@ -40,10 +40,3 @@ std::set_new_handler (new_handler handle return prev_handler; } -std::bad_alloc::~bad_alloc() throw() { } - -const char* -std::bad_alloc::what() const throw() -{ - return "std::bad_alloc"; -} Index: libsupc++/bad_alloc.cc =================================================================== --- libsupc++/bad_alloc.cc (revision 0) +++ libsupc++/bad_alloc.cc (revision 0) @@ -0,0 +1,36 @@ +// Implementation file for the -*- C++ -*- dynamic memory management header. + +// Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +// 2005, 2006, 2007, 2009, 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"; +}