You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2021/08/28 20:13:47 UTC
[incubator-nuttx] branch master updated (9ea7676 -> e3ab117)
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 9ea7676 arch:xtensa: rename XCHAL_INT_NLEVELS to XCHAL_NUM_INTLEVELS
new 95ff2e1 libcxxabi: Avoid the waring: "__EXCEPTIONS" is not defined, evaluates to 0 [-Werror=undef]
new bdc86e8 libcxx: Avoid the waring: "__EXCEPTIONS" is not defined, evaluates to 0 [-Werror=undef]
new ceb8bd4 libxx: Disable CXX_EXCEPTION by default to save the code space
new e3ab117 board: Enable CONFIG_LIBCXXABI when CONFIG_LIBCXX is enabled
The 4 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:
.../imxrt1050-evk/configs/libcxxtest/defconfig | 1 +
.../imxrt1060-evk/configs/libcxxtest/defconfig | 1 +
.../imxrt1064-evk/configs/libcxxtest/defconfig | 1 +
.../stm32f4discovery/configs/testlibcxx/defconfig | 1 +
.../risc-v/bl602/bl602evb/configs/wifi/defconfig | 1 +
boards/sim/sim/sim/configs/cxxtest/defconfig | 1 -
boards/sim/sim/sim/configs/libcxxtest/defconfig | 3 ++-
...oid-the-waring-__EXCEPTIONS-is-not-define.patch | 28 ++++++++++++++++++++++
...the-waring-__EXCEPTIONS-is-not-defined-ev.patch | 28 ++++++++++++++++++++++
libs/libxx/Kconfig | 1 -
libs/libxx/libcxx.defs | 1 +
libs/libxx/libcxxabi.defs | 1 +
12 files changed, 65 insertions(+), 3 deletions(-)
create mode 100644 libs/libxx/0001-libc-abi-avoid-the-waring-__EXCEPTIONS-is-not-define.patch
create mode 100644 libs/libxx/0001-libc-avoid-the-waring-__EXCEPTIONS-is-not-defined-ev.patch
[incubator-nuttx] 01/04: libcxxabi: Avoid the waring:
"__EXCEPTIONS" is not defined, evaluates to 0 [-Werror=undef]
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 95ff2e16a37bbde94f7814d8e0d3e4e224031da4
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Aug 28 02:16:23 2021 +0800
libcxxabi: Avoid the waring: "__EXCEPTIONS" is not defined, evaluates to 0 [-Werror=undef]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
...oid-the-waring-__EXCEPTIONS-is-not-define.patch | 28 ++++++++++++++++++++++
libs/libxx/libcxxabi.defs | 1 +
2 files changed, 29 insertions(+)
diff --git a/libs/libxx/0001-libc-abi-avoid-the-waring-__EXCEPTIONS-is-not-define.patch b/libs/libxx/0001-libc-abi-avoid-the-waring-__EXCEPTIONS-is-not-define.patch
new file mode 100644
index 0000000..3a2d0e8
--- /dev/null
+++ b/libs/libxx/0001-libc-abi-avoid-the-waring-__EXCEPTIONS-is-not-define.patch
@@ -0,0 +1,28 @@
+From d74ec1669d8f09d2ac9289423b51ae8b3af13d11 Mon Sep 17 00:00:00 2001
+From: Xiang Xiao <xi...@xiaomi.com>
+Date: Sat, 28 Aug 2021 02:11:15 +0800
+Subject: [PATCH] [libc++abi] avoid the waring: "__EXCEPTIONS" is not defined,
+ evaluates to 0 [-Werror=undef]
+
+Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
+Change-Id: I228cf44401f7ef9d7f49d8b806177bae1242d674
+---
+ include/__cxxabi_config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git libcxxabi/include/__cxxabi_config.h libcxxabi/include/__cxxabi_config.h
+index cffedb8..05ed8b6 100644
+--- libcxxabi/include/__cxxabi_config.h
++++ libcxxabi/include/__cxxabi_config.h
+@@ -93,7 +93,7 @@
+ # if !__has_feature(cxx_exceptions)
+ # define _LIBCXXABI_NO_EXCEPTIONS
+ # endif
+-#elif defined(_LIBCXXABI_COMPILER_GCC) && !__EXCEPTIONS
++#elif defined(_LIBCXXABI_COMPILER_GCC) && !defined(__EXCEPTIONS)
+ # define _LIBCXXABI_NO_EXCEPTIONS
+ #endif
+
+--
+2.25.1
+
diff --git a/libs/libxx/libcxxabi.defs b/libs/libxx/libcxxabi.defs
index c378d72..d9e8bab 100644
--- a/libs/libxx/libcxxabi.defs
+++ b/libs/libxx/libcxxabi.defs
@@ -26,6 +26,7 @@ libcxxabi-$(VERSION).src.tar.xz:
libcxxabi: libcxxabi-$(VERSION).src.tar.xz
$(Q) tar -xf libcxxabi-$(VERSION).src.tar.xz
$(Q) mv libcxxabi-$(VERSION).src libcxxabi
+ $(Q) patch -p0 < 0001-libc-abi-avoid-the-waring-__EXCEPTIONS-is-not-define.patch
$(Q) touch $@
distclean::
[incubator-nuttx] 03/04: libxx: Disable CXX_EXCEPTION by default to
save the code space
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ceb8bd4bceb1f1fdfdebb230221a4394cfdfc90f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Aug 28 09:48:37 2021 +0800
libxx: Disable CXX_EXCEPTION by default to save the code space
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I1b1fafa95f0e385a615dba78f43858b797c5ce69
---
boards/sim/sim/sim/configs/cxxtest/defconfig | 1 -
boards/sim/sim/sim/configs/libcxxtest/defconfig | 2 +-
libs/libxx/Kconfig | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/boards/sim/sim/sim/configs/cxxtest/defconfig b/boards/sim/sim/sim/configs/cxxtest/defconfig
index ea3d8ef..ed7c698 100644
--- a/boards/sim/sim/sim/configs/cxxtest/defconfig
+++ b/boards/sim/sim/sim/configs/cxxtest/defconfig
@@ -5,7 +5,6 @@
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
# modifications.
#
-# CONFIG_CXX_EXCEPTION is not set
CONFIG_ARCH="sim"
CONFIG_ARCH_BOARD="sim"
CONFIG_ARCH_BOARD_SIM=y
diff --git a/boards/sim/sim/sim/configs/libcxxtest/defconfig b/boards/sim/sim/sim/configs/libcxxtest/defconfig
index dd5bbc8..48138a0 100644
--- a/boards/sim/sim/sim/configs/libcxxtest/defconfig
+++ b/boards/sim/sim/sim/configs/libcxxtest/defconfig
@@ -5,7 +5,6 @@
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
# modifications.
#
-# CONFIG_CXX_EXCEPTION is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="sim"
CONFIG_ARCH_BOARD="sim"
@@ -17,6 +16,7 @@ CONFIG_BOARDCTL_POWEROFF=y
CONFIG_BOARD_LOOPSPERMSEC=0
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
+CONFIG_CXX_EXCEPTION=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_BINFMT=y
CONFIG_DEBUG_BINFMT_ERROR=y
diff --git a/libs/libxx/Kconfig b/libs/libxx/Kconfig
index bdf3b9b..a20d1ee 100644
--- a/libs/libxx/Kconfig
+++ b/libs/libxx/Kconfig
@@ -83,7 +83,6 @@ config HAVE_CXXINITIALIZE
config CXX_EXCEPTION
bool "Enable Exception Support"
- default LIBCXX || UCLIBCXX
if UCLIBCXX
[incubator-nuttx] 02/04: libcxx: Avoid the waring: "__EXCEPTIONS"
is not defined, evaluates to 0 [-Werror=undef]
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit bdc86e85d7ea59d7e31c0e863c7463690ddf03a1
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Aug 28 09:54:14 2021 +0800
libcxx: Avoid the waring: "__EXCEPTIONS" is not defined, evaluates to 0 [-Werror=undef]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
...the-waring-__EXCEPTIONS-is-not-defined-ev.patch | 28 ++++++++++++++++++++++
libs/libxx/libcxx.defs | 1 +
2 files changed, 29 insertions(+)
diff --git a/libs/libxx/0001-libc-avoid-the-waring-__EXCEPTIONS-is-not-defined-ev.patch b/libs/libxx/0001-libc-avoid-the-waring-__EXCEPTIONS-is-not-defined-ev.patch
new file mode 100644
index 0000000..a46ea85
--- /dev/null
+++ b/libs/libxx/0001-libc-avoid-the-waring-__EXCEPTIONS-is-not-defined-ev.patch
@@ -0,0 +1,28 @@
+From 828208f5061fabe5c42ceee6fb1ab0783c956271 Mon Sep 17 00:00:00 2001
+From: Xiang Xiao <xi...@xiaomi.com>
+Date: Sat, 28 Aug 2021 09:20:09 +0800
+Subject: [PATCH] [libc++] avoid the waring: "__EXCEPTIONS" is not defined,
+ evaluates to 0 [-Werror=undef]
+
+Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
+Change-Id: If529bbb2f87e55dce5d0df37f2bf72c3d02bf260
+---
+ include/__config | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git libcxx/include/__config libcxx/include/__config
+index e5828628d..edfe51224 100644
+--- libcxx/include/__config
++++ libcxx/include/__config
+@@ -551,7 +551,7 @@ typedef __char32_t char32_t;
+
+ #define _LIBCPP_NORETURN __attribute__((noreturn))
+
+-#if !__EXCEPTIONS
++#if !defined(__EXCEPTIONS)
+ # define _LIBCPP_NO_EXCEPTIONS
+ #endif
+
+--
+2.25.1
+
diff --git a/libs/libxx/libcxx.defs b/libs/libxx/libcxx.defs
index e12e24a..85bad00 100644
--- a/libs/libxx/libcxx.defs
+++ b/libs/libxx/libcxx.defs
@@ -28,6 +28,7 @@ libcxx: libcxx-$(VERSION).src.tar.xz
--exclude libcxx-$(VERSION).src/test/std/pstl
$(Q) mv libcxx-$(VERSION).src libcxx
$(Q) patch -p0 < 0001-Remove-the-locale-fallback-for-NuttX.patch
+ $(Q) patch -p0 < 0001-libc-avoid-the-waring-__EXCEPTIONS-is-not-defined-ev.patch
$(Q) touch $@
$(TOPDIR)/include/libcxx: libcxx
[incubator-nuttx] 04/04: board: Enable CONFIG_LIBCXXABI when
CONFIG_LIBCXX is enabled
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e3ab1179fa7afc1b02ba33dd87cf9b4fb2c466bd
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Aug 28 00:19:50 2021 +0800
board: Enable CONFIG_LIBCXXABI when CONFIG_LIBCXX is enabled
to avoid link libsupc++.a which is provided by toolchain
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig | 1 +
boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig | 1 +
boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig | 1 +
boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig | 1 +
boards/risc-v/bl602/bl602evb/configs/wifi/defconfig | 1 +
boards/sim/sim/sim/configs/libcxxtest/defconfig | 1 +
6 files changed, 6 insertions(+)
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
index 91e8c4e..a7a2c10 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
@@ -22,6 +22,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBCXX=y
+CONFIG_LIBCXXABI=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LOCALTIME=y
CONFIG_LIBM=y
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
index 8dd8042..c98032b 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
@@ -22,6 +22,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBCXX=y
+CONFIG_LIBCXXABI=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LOCALTIME=y
CONFIG_LIBM=y
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig
index d73afbf..5d4bf2d 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig
@@ -22,6 +22,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBCXX=y
+CONFIG_LIBCXXABI=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LOCALTIME=y
CONFIG_LIBM=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
index 83f3579..efdf82e 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
@@ -23,6 +23,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBCXX=y
+CONFIG_LIBCXXABI=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LOCALTIME=y
CONFIG_LIBM=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig b/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig
index 6ee05c2..c7d45de 100644
--- a/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig
@@ -56,6 +56,7 @@ CONFIG_IOB_NBUFFERS=64
CONFIG_IOB_NCHAINS=32
CONFIG_IOB_THROTTLE=10
CONFIG_LIBCXX=y
+CONFIG_LIBCXXABI=y
CONFIG_LIBC_LOCALTIME=y
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
diff --git a/boards/sim/sim/sim/configs/libcxxtest/defconfig b/boards/sim/sim/sim/configs/libcxxtest/defconfig
index 48138a0..86a397f 100644
--- a/boards/sim/sim/sim/configs/libcxxtest/defconfig
+++ b/boards/sim/sim/sim/configs/libcxxtest/defconfig
@@ -42,6 +42,7 @@ CONFIG_HAVE_CXX=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_IOB_NOTIFIER=y
CONFIG_LIBCXX=y
+CONFIG_LIBCXXABI=y
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_MM_FILL_ALLOCATIONS=y