Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / libsupc++ / vec.cc

diff --git a/libstdc++-v3/libsupc++/vec.cc b/libstdc++-v3/libsupc++/vec.cc
index 7e93d1c..886e6fc 100644 (file)
--- a/libstdc++-v3/libsupc++/vec.cc
+++ b/libstdc++-v3/libsupc++/vec.cc
@@ -1,12 +1,12 @@
 // New abi Support -*- C++ -*-
 
-// Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2003, 2004, 2009 Free Software Foundation, Inc.
 //  
 // 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 2, or (at your option)
+// 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,
@@ -14,19 +14,14 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with GCC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA. 
+// 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.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// 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/>.
 
 // Written by Nathan Sidwell, Codesourcery LLC, <nathan@codesourcery.com>
 
@@ -461,6 +456,9 @@ namespace __aeabiv1
   __aeabi_vec_dtor_cookie (void *array_address, 
                           abi::__cxa_cdtor_type destructor)
   {
+    if (!array_address)
+      return NULL;
+
     abi::__cxa_vec_dtor (array_address, 
                         reinterpret_cast<std::size_t *>(array_address)[-1],
                         reinterpret_cast<std::size_t *>(array_address)[-2],
@@ -473,6 +471,9 @@ namespace __aeabiv1
   __aeabi_vec_delete (void *array_address, 
                      abi::__cxa_cdtor_type destructor)
   {
+    if (!array_address)
+      return;
+
     abi::__cxa_vec_delete (array_address,
                           reinterpret_cast<std::size_t *>(array_address)[-2],
                           2 * sizeof (std::size_t),
@@ -484,6 +485,9 @@ namespace __aeabiv1
                       abi::__cxa_cdtor_type destructor,
                       void (*dealloc) (void *, std::size_t))
   {
+    if (!array_address)
+      return;
+
     abi::__cxa_vec_delete3 (array_address,
                            reinterpret_cast<std::size_t *>(array_address)[-2],
                            2 * sizeof (std::size_t),
@@ -494,19 +498,14 @@ namespace __aeabiv1
   __aeabi_vec_delete3_nodtor (void *array_address,
                              void (*dealloc) (void *, std::size_t))
   {
+    if (!array_address)
+      return;
+
     abi::__cxa_vec_delete3 (array_address,
                            reinterpret_cast<std::size_t *>(array_address)[-2],
                            2 * sizeof (std::size_t),
                            /*destructor=*/NULL, dealloc);
   }
-  
-  extern "C" int
-  __aeabi_atexit (void *object, 
-                 void (*destructor) (void *),
-                 void *dso_handle)
-  {
-    return abi::__cxa_atexit(destructor, object, dso_handle);
-  }
 } // namespace __aeabiv1
 
 #endif // defined(__arm__) && defined(__ARM_EABI__)