sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libxx: Move the partial c++ abi implementation to libcxxmini sub folder

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I2bc9b8be2962451a44352ab90623c9481bd162b2
This commit is contained in:
Xiang Xiao 2021-08-29 21:36:24 +08:00 committed by Gustavo Henrique Nihei
parent 9020c077f9
commit c8b93ed45e
13 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/libxx/Kconfig
View File

@ -24,10 +24,10 @@ if HAVE_CXX
choice
prompt "C++ Library"
default NOCXXLIB
default LIBCXXMINI
config NOCXXLIB
bool "NuttX Basic C++ support"
config LIBCXXMINI
bool "Basic C++ support"
---help---
A fragmentary C++ library that will allow to build only
the simplest of C++ applications. Only contain basic C++

18
libs/libxx/Makefile
View File

@ -19,14 +19,6 @@
include $(TOPDIR)/Make.defs
CXXSRCS = libxx_cxa_atexit.cxx
ifeq ($(CONFIG_LIBSUPCXX),y)
CXXSRCS += libxx_impure.cxx
else
CXXSRCS += libxx_eabi_atexit.cxx
endif
# Include the uClibc++ Make.defs file if selected. If it is included,
# the uClibc++/Make.defs file will add its files to the source file list,
# add its DEPPATH info, and will add the appropriate paths to the VPATH
@ -42,13 +34,21 @@ include uClibc++.defs
else ifeq ($(CONFIG_LIBCXX),y)
include libcxx.defs
else
include cxx.defs
include libcxxmini.defs
endif
ifeq ($(CONFIG_LIBCXXABI),y)
include libcxxabi.defs
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
CXXSRCS += libxx_impure.cxx
else
CXXSRCS += libxx_eabi_atexit.cxx
endif
CXXSRCS += libxx_cxa_atexit.cxx
# Object Files
AOBJS = $(ASRCS:.S=$(OBJEXT))

5
libs/libxx/cxx.defs → libs/libxx/libcxxmini.defs
View File

@ -1,5 +1,5 @@
############################################################################
# libs/libxx/cxx.defs
# libs/libxx/libcxxmini.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@ -34,3 +34,6 @@ ifneq ($(CONFIG_XTENSA_TOOLCHAIN_XCC), y)
libxx_new.cxx_CXXFLAGS += -Wno-missing-exception-spec
libxx_newa.cxx_CXXFLAGS += -Wno-missing-exception-spec
endif
DEPPATH += --dep-path libcxxmini
VPATH += libcxxmini

2
libs/libxx/libxx_cxa_guard.cxx → libs/libxx/libcxxmini/libxx_cxa_guard.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libs/libxx/libxx_cxa_guard.cxx
// libs/libxx/libcxxmini/libxx_cxa_guard.cxx
//
// Copyright (C) 2015 Omni Hoverboards Inc. All rights reserved.
// Author: Paul Alexander Patience <paul-a.patience@polymtl.ca>

2
libs/libxx/libxx_cxapurevirtual.cxx → libs/libxx/libcxxmini/libxx_cxapurevirtual.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libs/libxx/libxx_cxapurevirtual.cxx
// libs/libxx/libcxxmini/libxx_cxapurevirtual.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with

4
libs/libxx/libxx_delete.cxx → libs/libxx/libcxxmini/libxx_delete.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libs/libxx/libxx_delete.cxx
// libs/libxx/libcxxmini/libxx_delete.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
@ -23,7 +23,7 @@
#include <nuttx/config.h>
#include "libxx.hxx"
#include <nuttx/lib/lib.h>
//***************************************************************************
// Operators

4
libs/libxx/libxx_delete_sized.cxx → libs/libxx/libcxxmini/libxx_delete_sized.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libs/libxx/libxx_delete_sized.cxx
// libs/libxx/libcxxmini/libxx_delete_sized.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
@ -25,7 +25,7 @@
#include <cstddef>
#include "libxx.hxx"
#include <nuttx/lib/lib.h>
#ifdef CONFIG_HAVE_CXX14

4
libs/libxx/libxx_deletea.cxx → libs/libxx/libcxxmini/libxx_deletea.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libs/libxx/libxx_deletea.cxx
// libs/libxx/libcxxmini/libxx_deletea.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
@ -23,7 +23,7 @@
#include <nuttx/config.h>
#include "libxx.hxx"
#include <nuttx/lib/lib.h>
//***************************************************************************
// Operators

4
libs/libxx/libxx_deletea_sized.cxx → libs/libxx/libcxxmini/libxx_deletea_sized.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libs/libxx/libxx_deletea_sized.cxx
// libs/libxx/libcxxmini/libxx_deletea_sized.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
@ -26,7 +26,7 @@
#include <cstddef>
#include "libxx.hxx"
#include <nuttx/lib/lib.h>
#ifdef CONFIG_HAVE_CXX14

4
libs/libxx/libxx_new.cxx → libs/libxx/libcxxmini/libxx_new.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libs/libxx/libxx_new.cxx
// libs/libxx/libcxxmini/libxx_new.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
@ -25,7 +25,7 @@
#include <cstddef>
#include <debug.h>
#include "libxx.hxx"
#include <nuttx/lib/lib.h>
//***************************************************************************
// Operators

4
libs/libxx/libxx_newa.cxx → libs/libxx/libcxxmini/libxx_newa.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libs/libxx/libxx_newa.cxx
// libs/libxx/libcxxmini/libxx_newa.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
@ -25,7 +25,7 @@
#include <cstddef>
#include <debug.h>
#include "libxx.hxx"
#include <nuttx/lib/lib.h>
//***************************************************************************
// Pre-processor Definitions

2
libs/libxx/libxx.hxx
View File

@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/lib/lib.h>
#include <nuttx/compiler.h>
//***************************************************************************
// Public Types

1
libs/libxx/libxx_cxa_atexit.cxx
View File

@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <cassert>
#include <nuttx/lib/lib.h>
#include "libxx.hxx"