From patchwork Tue Oct  5 09:42:46 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v3] fix libstdc++/44647
Date: Mon, 04 Oct 2010 23:42:46 -0000
From: Paolo Carlini <pcarlini@gmail.com>
X-Patchwork-Id: 66779
Message-Id: <4CAAF316.50203@gmail.com>
To: Paolo Carlini <paolo.carlini@oracle.com>
Cc: Jonathan Wakely <jwakely.gcc@gmail.com>,
 libstdc++ <libstdc++@gcc.gnu.org>, gcc-patches <gcc-patches@gcc.gnu.org>,
 Sebastian Huber <sebastian.huber@embedded-brains.de>

... went ahead, and just committed the below. Tested x86_64-linux.

Paolo.

///////////////
2010-10-05  Sebastian Huber  <sebastian.huber@embedded-brains.de>
	    Jonathan Wakely  <jwakely.gcc@gmail.com>

	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
+// <http://www.gnu.org/licenses/>.
+
+#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";
-}