You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/01/04 15:20:10 UTC
(nuttx) branch master updated (40f4cde8f5 -> fc53497ea2)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 40f4cde8f5 armv7-m: Expose section name to allow relocation
new 23db901bb3 libcxxabi.cmake: fix download
new bb053f137d libcxxabi.cmake: remove a patch which no longer exists
new 7d6612d0e5 libcxxabi.cmake: fix build error
new 05b8655bdd arch/sim/src/cmake/Toolchain.cmake: fix inverted conditions for C++ features
new fc53497ea2 arch/arm/src/cmake/Toolchain.cmake: fix inverted conditions for C++ features
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/cmake/Toolchain.cmake | 4 ++--
arch/sim/src/cmake/Toolchain.cmake | 4 ++--
libs/libxx/libcxxabi.cmake | 9 +++++----
3 files changed, 9 insertions(+), 8 deletions(-)
(nuttx) 01/05: libcxxabi.cmake: fix download
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 23db901bb345b3ccc78edf0b5a92f96c8c0d2383
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Jan 4 17:03:52 2024 +0900
libcxxabi.cmake: fix download
don't forget to expand CONFIG_LIBCXXABI_VERSION
---
libs/libxx/libcxxabi.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/libxx/libcxxabi.cmake b/libs/libxx/libcxxabi.cmake
index 30393e0113..f6715a76d9 100644
--- a/libs/libxx/libcxxabi.cmake
+++ b/libs/libxx/libcxxabi.cmake
@@ -20,7 +20,7 @@
if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/libcxxabi)
- set(LIBCXXABI_VERSION CONFIG_LIBCXXABI_VERSION)
+ set(LIBCXXABI_VERSION ${CONFIG_LIBCXXABI_VERSION})
FetchContent_Declare(
libcxxabi
(nuttx) 03/05: libcxxabi.cmake: fix build error
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 7d6612d0e53fdff882fa7bf61e0892287bcd78d3
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Jan 4 17:05:51 2024 +0900
libcxxabi.cmake: fix build error
This tries to mirror the following change.
```
commit c260fee5163cdd3d7eb01576f606e83dcf6f7808
Author: Gustavo Henrique Nihei <gu...@espressif.com>
Date: Tue Aug 31 14:47:13 2021 -0300
libs/libxx: Enforce RTTI for building libcxxabi
It is okay for the application to be built without RTTI (-fno-rrti), but
libcxxabi requires RTTI at least for the library.
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
```
---
libs/libxx/libcxxabi.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libs/libxx/libcxxabi.cmake b/libs/libxx/libcxxabi.cmake
index fb4589d020..63bd3f7b00 100644
--- a/libs/libxx/libcxxabi.cmake
+++ b/libs/libxx/libcxxabi.cmake
@@ -99,4 +99,7 @@ foreach(src ${SRCS})
list(APPEND TARGET_SRCS ${src})
endforeach()
+# RTTI is required for building the libcxxabi library
+target_compile_options(libcxxabi PRIVATE -frtti)
+
target_sources(libcxxabi PRIVATE ${TARGET_SRCS})
(nuttx) 05/05: arch/arm/src/cmake/Toolchain.cmake: fix inverted conditions for C++ features
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fc53497ea2cf4ec35edd59d885e745038df91cbb
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Jan 4 17:07:50 2024 +0900
arch/arm/src/cmake/Toolchain.cmake: fix inverted conditions for C++ features
Fix inverted CONFIG_CXX_EXCEPTION/CONFIG_CXX_RTTI checks.
---
arch/arm/src/cmake/Toolchain.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/cmake/Toolchain.cmake b/arch/arm/src/cmake/Toolchain.cmake
index 3d3de23681..8039952d9d 100644
--- a/arch/arm/src/cmake/Toolchain.cmake
+++ b/arch/arm/src/cmake/Toolchain.cmake
@@ -184,11 +184,11 @@ endif()
set(ARCHCFLAGS "-Wstrict-prototypes")
set(ARCHCXXFLAGS "-nostdinc++")
-if(CONFIG_CXX_EXCEPTION)
+if(NOT CONFIG_CXX_EXCEPTION)
string(APPEND ARCHCXXFLAGS " -fno-exceptions -fcheck-new")
endif()
-if(CONFIG_CXX_RTTI)
+if(NOT CONFIG_CXX_RTTI)
string(APPEND ARCHCXXFLAGS " -fno-rtti")
endif()
(nuttx) 02/05: libcxxabi.cmake: remove a patch which no longer exists
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit bb053f137d50b4109e4a47f2eb16b661ff8b8c8f
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Jan 4 17:04:18 2024 +0900
libcxxabi.cmake: remove a patch which no longer exists
the patch has been removed in the following change.
```
commit 4f90a6140c896283151719f05efc34157118ff18
Author: Stuart Ianna <st...@motec.com.au>
Date: Mon Jan 23 09:08:00 2023 +1100
libcxx: Remove exiting patches and update libcxx version to 15.0.7
- Add __config_site for NuttX.
In libcxx 12.0.0. CMake concatenated __config_site with _config,
which enabled NuttX to build without its inclusion. In 15.0.7, this
file is configured by CMake and included explicitly in __config.
- Add additional include directories.
- Mute always_inline warning.
- Make the download of libcxx/libcxxabi configurable
```
---
libs/libxx/libcxxabi.cmake | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libs/libxx/libcxxabi.cmake b/libs/libxx/libcxxabi.cmake
index f6715a76d9..fb4589d020 100644
--- a/libs/libxx/libcxxabi.cmake
+++ b/libs/libxx/libcxxabi.cmake
@@ -39,9 +39,7 @@ if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/libcxxabi)
""
TEST_COMMAND
""
- PATCH_COMMAND
- patch -p0 -d ${CMAKE_CURRENT_LIST_DIR} <
- ${CMAKE_CURRENT_LIST_DIR}/0001-libc-abi-avoid-the-waring-__EXCEPTIONS-is-not-define.patch
+ PATCH_COMMAND ""
DOWNLOAD_NO_PROGRESS true
TIMEOUT 30)
(nuttx) 04/05: arch/sim/src/cmake/Toolchain.cmake: fix inverted conditions for C++ features
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 05b8655bdd7c3a0d1524791f207686924f9bf127
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Jan 4 17:07:02 2024 +0900
arch/sim/src/cmake/Toolchain.cmake: fix inverted conditions for C++ features
Fix inverted CONFIG_CXX_EXCEPTION/CONFIG_CXX_RTTI checks.
---
arch/sim/src/cmake/Toolchain.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sim/src/cmake/Toolchain.cmake b/arch/sim/src/cmake/Toolchain.cmake
index 47ef9e5f02..c3af008a26 100644
--- a/arch/sim/src/cmake/Toolchain.cmake
+++ b/arch/sim/src/cmake/Toolchain.cmake
@@ -101,11 +101,11 @@ endif()
set(ARCHCFLAGS "-Wstrict-prototypes")
set(ARCHCXXFLAGS "-nostdinc++")
-if(CONFIG_CXX_EXCEPTION)
+if(NOT CONFIG_CXX_EXCEPTION)
string(APPEND ARCHCXXFLAGS " -fno-exceptions -fcheck-new")
endif()
-if(CONFIG_CXX_RTTI)
+if(NOT CONFIG_CXX_RTTI)
string(APPEND ARCHCXXFLAGS " -fno-rtti")
endif()