re PR libstdc++/44647 (std::nothrow and std::bad_alloc are coupled)

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.

Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r164973

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6604d68075bafab11dfd95f3fc1ddcd80e6f9a38..97f94fdf80d9989fea86659242824a48554b8fde 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2010-10-04  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/std/functional (function<>::swap): Use std::swap.

diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index 5fbad83049a7a78c1fb1cc103f0f1019da22ae81..688e139cf595b8148060ab9cf7f0a093a114d56e 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -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 @@ endif
 sources = \
        array_type_info.cc \
        atexit_arm.cc \
+       bad_alloc.cc \
        bad_cast.cc \
        bad_typeid.cc \
        class_type_info.cc \

diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 394bd42afe0bada0953a199bb1081fef1baab16b..b0c507332dd05d6de53a62394aacd8813c0c7dc3 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -88,13 +88,13 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
        "$(DESTDIR)$(glibcxxinstalldir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
 libsupc___la_LIBADD =
-am__objects_1 = array_type_info.lo atexit_arm.lo bad_cast.lo \
-       bad_typeid.lo class_type_info.lo del_op.lo del_opnt.lo \
-       del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo eh_arm.lo \
-       eh_aux_runtime.lo eh_call.lo eh_catch.lo eh_exception.lo \
-       eh_globals.lo eh_personality.lo eh_ptr.lo eh_term_handler.lo \
-       eh_terminate.lo eh_throw.lo eh_type.lo eh_unex_handler.lo \
-       enum_type_info.lo function_type_info.lo \
+am__objects_1 = array_type_info.lo atexit_arm.lo bad_alloc.lo \
+       bad_cast.lo bad_typeid.lo class_type_info.lo del_op.lo \
+       del_opnt.lo del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo \
+       eh_arm.lo eh_aux_runtime.lo eh_call.lo eh_catch.lo \
+       eh_exception.lo eh_globals.lo eh_personality.lo eh_ptr.lo \
+       eh_term_handler.lo eh_terminate.lo eh_throw.lo eh_type.lo \
+       eh_unex_handler.lo enum_type_info.lo function_type_info.lo \
        fundamental_type_info.lo guard.lo hash_bytes.lo new_handler.lo \
        new_op.lo new_opnt.lo new_opv.lo new_opvnt.lo \
        pbase_type_info.lo pmem_type_info.lo pointer_type_info.lo \
@@ -338,6 +338,7 @@ headers = \
 sources = \
        array_type_info.cc \
        atexit_arm.cc \
+       bad_alloc.cc \
        bad_cast.cc \
        bad_typeid.cc \
        class_type_info.cc \

diff --git a/libstdc++-v3/libsupc++/bad_alloc.cc b/libstdc++-v3/libsupc++/bad_alloc.cc
new file mode 100644 (file)
index 0000000..16076ce
--- /dev/null
+++ b/libstdc++-v3/libsupc++/bad_alloc.cc
@@ -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";
+}

diff --git a/libstdc++-v3/libsupc++/new_handler.cc b/libstdc++-v3/libsupc++/new_handler.cc
index 6d17a6f6c0a96428bbdbdf4c8bd61cd7c50a3281..4e3c93545a58750cd5352fc3d1e192d07d120c2b 100644 (file)
--- a/libstdc++-v3/libsupc++/new_handler.cc
+++ b/libstdc++-v3/libsupc++/new_handler.cc
@@ -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 @@ std::set_new_handler (new_handler handler) throw()
   __new_handler = handler;
   return prev_handler;
 }
-
-std::bad_alloc::~bad_alloc() throw() { }
-
-const char* 
-std::bad_alloc::what() const throw()
-{
-  return "std::bad_alloc";
-}