From f46482fa78b1df5ccbf324799e544c69d25a9525 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 12 Aug 2017 12:44:08 -0600 Subject: [PATCH] C++: Compilation with recent C++ compiler needs an overloaded delete operator that includes a size_t size argument. --- libxx/Kconfig | 1 - libxx/Makefile | 6 ++-- libxx/libxx_delete.cxx | 10 +----- libxx/libxx_delete_sized.cxx | 70 ++++++++++++++++++++++++++++++++++++ libxx/libxx_new.cxx | 8 ----- 5 files changed, 74 insertions(+), 21 deletions(-) create mode 100644 libxx/libxx_delete_sized.cxx diff --git a/libxx/Kconfig b/libxx/Kconfig index 722207e6b95..a29d1591472 100644 --- a/libxx/Kconfig +++ b/libxx/Kconfig @@ -30,7 +30,6 @@ config CXX_NEWLONG C++ library routines because the NuttX size_t might not have the same underlying type as your toolchain's size_t. - comment "LLVM C++ Library (libcxx)" config LIBCXX diff --git a/libxx/Makefile b/libxx/Makefile index 9f5ba9c9ac7..d4fd7fed93c 100644 --- a/libxx/Makefile +++ b/libxx/Makefile @@ -1,7 +1,7 @@ ############################################################################ # libxx/Makefile # -# Copyright (C) 2009, 2012, 2016 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012, 2016-2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -49,8 +49,8 @@ endif # because uClibx++ or libcxx will replaces them ifeq (,$(findstring y,$(CONFIG_UCLIBCXX) $(CONFIG_LIBCXX))) -CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx -CXXSRCS += libxx_stdthrow.cxx +CXXSRCS += libxx_delete.cxx libxx_delete_sized.cxx libxx_deletea.cxx +CXXSRCS +=libxx_new.cxx libxx_newa.cxx libxx_stdthrow.cxx else ifeq (,$(findstring y,$(CONFIG_UCLIBCXX_EXCEPTION) $(CONFIG_LIBCXX_EXCEPTION))) CXXSRCS += libxx_stdthrow.cxx diff --git a/libxx/libxx_delete.cxx b/libxx/libxx_delete.cxx index dec28a85c24..ba33dbe7a8e 100644 --- a/libxx/libxx_delete.cxx +++ b/libxx/libxx_delete.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// libxx/libxx_new.cxx +// libxx/libxx_delete.cxx // // Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -41,14 +41,6 @@ #include "libxx.hxx" -//*************************************************************************** -// Pre-processor Definitions -//*************************************************************************** - -//*************************************************************************** -// Private Data -//*************************************************************************** - //*************************************************************************** // Operators //*************************************************************************** diff --git a/libxx/libxx_delete_sized.cxx b/libxx/libxx_delete_sized.cxx new file mode 100644 index 00000000000..ff461d9486c --- /dev/null +++ b/libxx/libxx_delete_sized.cxx @@ -0,0 +1,70 @@ +//*************************************************************************** +// libxx/libxx_delete_sized.cxx +// +// Copyright (C) 2007 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// 3. Neither the name NuttX nor the names of its contributors may be +// used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +//*************************************************************************** + +//*************************************************************************** +// Included Files +//*************************************************************************** + +#include + +#include "libxx.hxx" + +//*************************************************************************** +// Operators +//*************************************************************************** + +//*************************************************************************** +// Name: delete +// +// NOTE: +// This should take a type of size_t. But size_t has an unknown underlying +// type. In the nuttx sys/types.h header file, size_t is typed as uint32_t +// (which is determined by architecture-specific logic). But the C++ +// compiler may believe that size_t is of a different type resulting in +// compilation errors in the operator. Using the underlying integer type +// instead of size_t seems to resolve the compilation issues. Need to +// REVISIT this. +// +//*************************************************************************** + +//void operator delete(FAR void *ptr, std::size_t size) +#ifdef CONFIG_CXX_NEWLONG +void *operator delete(FAR void *ptr, unsigned long nbytes) +#else +void *operator delete(FAR void *ptr, unsigned int nbytes) +#endif +{ + lib_free(ptr); +} diff --git a/libxx/libxx_new.cxx b/libxx/libxx_new.cxx index 863321e6738..7aeb6bf491e 100644 --- a/libxx/libxx_new.cxx +++ b/libxx/libxx_new.cxx @@ -43,14 +43,6 @@ #include "libxx.hxx" -//*************************************************************************** -// Pre-processor Definitions -//*************************************************************************** - -//*************************************************************************** -// Private Data -//*************************************************************************** - //*************************************************************************** // Operators //***************************************************************************