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 2021/09/02 05:59:18 UTC
[incubator-nuttx] branch master updated (13bf6f0 -> 2ff6338)
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/incubator-nuttx.git.
from 13bf6f0 github: Update links to Docker Linux image
new ba44da9 Revert "libxx:uClibxx:add-weak-function-for-new-del-operations"
new 2ff6338 uClibcxx: remove function that conflict with libsupc++
The 2 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:
...-add-weak-function-for-new-del-operations.patch | 174 ---------------------
libs/libxx/uClibc++.defs | 7 +-
2 files changed, 2 insertions(+), 179 deletions(-)
delete mode 100644 libs/libxx/0002-uClibc-add-weak-function-for-new-del-operations.patch
[incubator-nuttx] 01/02: Revert
"libxx:uClibxx:add-weak-function-for-new-del-operations"
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/incubator-nuttx.git
commit ba44da9a3220a395d9869155fa30a1f335114b0f
Author: zhuyanlin <zh...@xiaomi.com>
AuthorDate: Thu Sep 2 11:51:54 2021 +0800
Revert "libxx:uClibxx:add-weak-function-for-new-del-operations"
This reverts commit 40a110b4a8c3688a61c32aafa21a76adfcf2c404.
---
...-add-weak-function-for-new-del-operations.patch | 174 ---------------------
libs/libxx/uClibc++.defs | 1 -
2 files changed, 175 deletions(-)
diff --git a/libs/libxx/0002-uClibc-add-weak-function-for-new-del-operations.patch b/libs/libxx/0002-uClibc-add-weak-function-for-new-del-operations.patch
deleted file mode 100644
index d23d2c0..0000000
--- a/libs/libxx/0002-uClibc-add-weak-function-for-new-del-operations.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From ecfcd061549a1dd3c034a06f48d3b4343ba01e93 Mon Sep 17 00:00:00 2001
-From: zhuyanlin <zh...@xiaomi.com>
-Date: Mon, 30 Aug 2021 14:13:16 +0800
-Subject: [PATCH 2/2] uClibc++: add weak function for new/del operations.
-
-Let compiler could select function from cxx library
-or toolchain library.
-
-Change-Id: I85de5b0384ccdc231d76cf72e044ef42bb951fac
----
- include/basic_definitions | 2 ++
- src/del_op.cpp | 1 +
- src/del_opnt.cpp | 1 +
- src/del_ops.cpp | 1 +
- src/del_opv.cpp | 1 +
- src/del_opvnt.cpp | 1 +
- src/del_opvs.cpp | 1 +
- src/new_handler.cpp | 1 +
- src/new_op.cpp | 1 +
- src/new_opnt.cpp | 1 +
- src/new_opv.cpp | 1 +
- src/new_opvnt.cpp | 1 +
- 13 files changed, 15 insertions(+)
-
-diff --git a/uClibc++/include/basic_definitions uClibc++/include/basic_definitions
-index 1a8dc31..d3d9fce 100644
---- a/uClibc++/include/basic_definitions
-+++ uClibc++/include/basic_definitions
-@@ -35,8 +35,10 @@
-
- #ifdef __GNUC__
- #define __UCLIBCXX_NORETURN __attribute__ ((__noreturn__))
-+#define __UCLIBCXX_WEAK __attribute__ ((__weak__))
- #else
- #define __UCLIBCXX_NORETURN
-+#define __UCLIBCXX_WEAK
- #endif
-
- #ifdef __GNUC__
-diff --git a/uClibc++/src/del_op.cpp uClibc++/src/del_op.cpp
-index 9485cee..3f52a0d 100644
---- a/uClibc++/src/del_op.cpp
-+++ uClibc++/src/del_op.cpp
-@@ -21,6 +21,7 @@
- #include <cstdlib>
- #include <func_exception>
-
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void operator delete(void* ptr) _UCXX_USE_NOEXCEPT{
- free(ptr);
- }
-diff --git a/uClibc++/src/del_opnt.cpp uClibc++/src/del_opnt.cpp
-index 4825912..a5284c6 100644
---- a/uClibc++/src/del_opnt.cpp
-+++ uClibc++/src/del_opnt.cpp
-@@ -22,6 +22,7 @@
- #include <func_exception>
-
- #ifndef NO_NOTHROW
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void operator delete(void* ptr, const std::nothrow_t& ) _UCXX_USE_NOEXCEPT {
- free(ptr);
- }
-diff --git a/uClibc++/src/del_ops.cpp uClibc++/src/del_ops.cpp
-index b914fc5..bce186f 100644
---- a/uClibc++/src/del_ops.cpp
-+++ uClibc++/src/del_ops.cpp
-@@ -22,6 +22,7 @@
- #include <cstdlib>
- #include <func_exception>
-
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void operator delete(void* ptr, std::size_t) _UCXX_USE_NOEXCEPT{
- ::operator delete (ptr);
- }
-diff --git a/uClibc++/src/del_opv.cpp uClibc++/src/del_opv.cpp
-index deaad78..e7d60b7 100644
---- a/uClibc++/src/del_opv.cpp
-+++ uClibc++/src/del_opv.cpp
-@@ -21,6 +21,7 @@
- #include <cstdlib>
- #include <func_exception>
-
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void operator delete[](void * ptr) _UCXX_USE_NOEXCEPT{
- free(ptr);
- }
-diff --git a/uClibc++/src/del_opvnt.cpp uClibc++/src/del_opvnt.cpp
-index 71b7631..f1f0d62 100644
---- a/uClibc++/src/del_opvnt.cpp
-+++ uClibc++/src/del_opvnt.cpp
-@@ -22,6 +22,7 @@
- #include <func_exception>
-
- #ifndef NO_NOTHROW
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void operator delete[](void* ptr, const std::nothrow_t& ) _UCXX_USE_NOEXCEPT{
- free(ptr);
- }
-diff --git a/uClibc++/src/del_opvs.cpp uClibc++/src/del_opvs.cpp
-index 53ab7cc..709ef72 100644
---- a/uClibc++/src/del_opvs.cpp
-+++ uClibc++/src/del_opvs.cpp
-@@ -22,6 +22,7 @@
- #include <cstdlib>
- #include <func_exception>
-
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void operator delete[](void * ptr, std::size_t) _UCXX_USE_NOEXCEPT{
- ::operator delete[] (ptr);
- }
-diff --git a/uClibc++/src/new_handler.cpp uClibc++/src/new_handler.cpp
-index a6efb9c..1001daa 100644
---- a/uClibc++/src/new_handler.cpp
-+++ uClibc++/src/new_handler.cpp
-@@ -24,6 +24,7 @@ const std::nothrow_t std::nothrow = { };
- //Name selected to be compatable with g++ code
- std::new_handler __new_handler;
-
-+__UCLIBCXX_WEAK
- _UCXXEXPORT std::new_handler std::set_new_handler(std::new_handler new_p) _UCXX_USE_NOEXCEPT{
- std::new_handler retval = __new_handler;
- __new_handler = new_p;
-diff --git a/uClibc++/src/new_op.cpp uClibc++/src/new_op.cpp
-index b0d2b78..bda66f0 100644
---- a/uClibc++/src/new_op.cpp
-+++ uClibc++/src/new_op.cpp
-@@ -21,6 +21,7 @@
- #include <cstdlib>
- #include <func_exception>
-
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void* operator new(std::size_t numBytes) _UCXX_THROW(std::bad_alloc)
- {
- //C++ stardard 5.3.4.8 requires that a valid pointer be returned for
-diff --git a/uClibc++/src/new_opnt.cpp uClibc++/src/new_opnt.cpp
-index c37903e..85069a8 100644
---- a/uClibc++/src/new_opnt.cpp
-+++ uClibc++/src/new_opnt.cpp
-@@ -22,6 +22,7 @@
- #include <func_exception>
-
- #ifndef NO_NOTHROW
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void* operator new(std::size_t numBytes, const std::nothrow_t& ) _UCXX_USE_NOEXCEPT{
- return malloc(numBytes);
- }
-diff --git a/uClibc++/src/new_opv.cpp uClibc++/src/new_opv.cpp
-index e39d5e5..72ee41f 100644
---- a/uClibc++/src/new_opv.cpp
-+++ uClibc++/src/new_opv.cpp
-@@ -21,6 +21,7 @@
- #include <cstdlib>
- #include <func_exception>
-
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void* operator new[](std::size_t numBytes)_UCXX_THROW(std::bad_alloc){
- //C++ stardard 5.3.4.8 requires that a valid pointer be returned for
- //a call to new(0). Thus:
-diff --git a/uClibc++/src/new_opvnt.cpp uClibc++/src/new_opvnt.cpp
-index 4874a7f..2247ebc 100644
---- a/uClibc++/src/new_opvnt.cpp
-+++ uClibc++/src/new_opvnt.cpp
-@@ -22,6 +22,7 @@
- #include <func_exception>
-
- #ifndef NO_NOTHROW
-+__UCLIBCXX_WEAK
- _UCXXEXPORT void* operator new[](std::size_t numBytes, const std::nothrow_t& ) _UCXX_USE_NOEXCEPT{
- return malloc(numBytes);
- }
---
-2.25.1
-
diff --git a/libs/libxx/uClibc++.defs b/libs/libxx/uClibc++.defs
index fb7bd29..1da0b74 100644
--- a/libs/libxx/uClibc++.defs
+++ b/libs/libxx/uClibc++.defs
@@ -28,7 +28,6 @@ $(TOPDIR)/include/uClibc++:
$(Q) $(DIRLINK) $(CURDIR)/uClibc++/include $(TOPDIR)/include/uClibc++
$(Q) $(COPYFILE) $(CURDIR)/system_configuration.h $(TOPDIR)/include/uClibc++
$(Q) patch -p0 < 0001-uClibcxx-basic_definitions-fix-GCC-specific-definiti.patch
- $(Q) patch -p0 < 0002-uClibc-add-weak-function-for-new-del-operations.patch
context:: $(TOPDIR)/include/uClibc++
[incubator-nuttx] 02/02: uClibcxx: remove function that conflict
with libsupc++
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/incubator-nuttx.git
commit 2ff63388b3e683eeb01baafc977036d7fc572055
Author: zhuyanlin <zh...@xiaomi.com>
AuthorDate: Thu Sep 2 11:55:49 2021 +0800
uClibcxx: remove function that conflict with libsupc++
The New_/del_ function already contain in libsupc++.
---
libs/libxx/uClibc++.defs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libs/libxx/uClibc++.defs b/libs/libxx/uClibc++.defs
index 1da0b74..f10be48 100644
--- a/libs/libxx/uClibc++.defs
+++ b/libs/libxx/uClibc++.defs
@@ -37,11 +37,9 @@ distclean::
$(call DELDIR, uClibc++)
CPPSRCS += algorithm.cpp associative_base.cpp bitset.cpp char_traits.cpp
-CPPSRCS += complex.cpp del_op.cpp del_opnt.cpp del_ops.cpp del_opv.cpp
-CPPSRCS += del_opvnt.cpp del_opvs.cpp deque.cpp exception.cpp fstream.cpp
+CPPSRCS += complex.cpp deque.cpp exception.cpp fstream.cpp
CPPSRCS += func_exception.cpp iomanip.cpp ios.cpp iostream.cpp istream.cpp
-CPPSRCS += iterator.cpp limits.cpp list.cpp locale.cpp map.cpp new_handler.cpp
-CPPSRCS += new_op.cpp new_opnt.cpp new_opv.cpp new_opvnt.cpp numeric.cpp
+CPPSRCS += iterator.cpp limits.cpp list.cpp locale.cpp map.cpp numeric.cpp
CPPSRCS += ostream.cpp queue.cpp set.cpp sstream.cpp stack.cpp stdexcept.cpp
CPPSRCS += streambuf.cpp string.cpp typeinfo.cpp utility.cpp valarray.cpp
CPPSRCS += vector.cpp