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 2022/02/24 14:13:55 UTC
[incubator-nuttx] branch master updated (6fa5885 -> 1aedf30)
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 6fa5885 arch/esp32: Update esp-wireless-drivers-3rdparty to verion 45701c0
new 7d35020 xtensa: fix `XTHAL_REL_LE` not find
new 1aedf30 libc:machine:xtensa: fix warning
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:
arch/xtensa/include/xtensa/core.h | 12 ++++++++++++
libs/libc/machine/xtensa/arch_setjmp.S | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
[incubator-nuttx] 01/02: xtensa: fix `XTHAL_REL_LE` not find
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 7d350204f0f9c212df5a413c886bfbb05da47355
Author: zhuyanlin <zh...@xiaomi.com>
AuthorDate: Wed Feb 16 18:24:52 2022 +0800
xtensa: fix `XTHAL_REL_LE` not find
fix `XTHAL_REL_LE` not find build break
Signed-off-by: zhuyanlin <zh...@xiaomi.com>
---
arch/xtensa/include/xtensa/core.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/xtensa/include/xtensa/core.h b/arch/xtensa/include/xtensa/core.h
index 01112b9..6efab57 100644
--- a/arch/xtensa/include/xtensa/core.h
+++ b/arch/xtensa/include/xtensa/core.h
@@ -1393,6 +1393,18 @@
#define XTHAL_INST_ILL 0x000000 /* 3-byte illegal instruction */
+/* Version comparison operators (among major/minor pairs): */
+
+#define XTHAL_REL_GE(maja,mina, majb,minb) ((maja) > (majb) || \
+ ((maja) == (majb) && (mina) >= (minb)))
+#define XTHAL_REL_GT(maja,mina, majb,minb) ((maja) > (majb) || \
+ ((maja) == (majb) && (mina) > (minb)))
+#define XTHAL_REL_LE(maja,mina, majb,minb) ((maja) < (majb) || \
+ ((maja) == (majb) && (mina) <= (minb)))
+#define XTHAL_REL_LT(maja,mina, majb,minb) ((maja) < (majb) || \
+ ((maja) == (majb) && (mina) < (minb)))
+#define XTHAL_REL_EQ(maja,mina, majb,minb) ((maja) == (majb) && (mina) == (minb))
+
/* Because information as to exactly which hardware version is targeted
* by a given software build is not always available, compile-time HAL
* Hardware-Release "_AT" macros are fuzzy (return 0, 1, or XCHAL_MAYBE):
[incubator-nuttx] 02/02: libc:machine:xtensa: fix warning
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 1aedf30f38bdb02b68b79e7f50bf7db133847b27
Author: zhuyanlin <zh...@xiaomi.com>
AuthorDate: Wed Feb 16 18:36:11 2022 +0800
libc:machine:xtensa: fix warning
Signed-off-by: zhuyanlin <zh...@xiaomi.com>
---
libs/libc/machine/xtensa/arch_setjmp.S | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libs/libc/machine/xtensa/arch_setjmp.S b/libs/libc/machine/xtensa/arch_setjmp.S
index 99b83af..e24ce65 100644
--- a/libs/libc/machine/xtensa/arch_setjmp.S
+++ b/libs/libc/machine/xtensa/arch_setjmp.S
@@ -22,6 +22,7 @@
* Included Files
****************************************************************************/
+#include <arch/xtensa/core.h>
#include <arch/chip/core-isa.h>
#include <arch/xtensa/xtensa_abi.h>
@@ -29,7 +30,7 @@
* Public Functions
****************************************************************************/
-#if XCHAL_HAVE_WINDOWED && !__XTENSA_CALL0_ABI__
+#if XCHAL_HAVE_WINDOWED && !defined(__XTENSA_CALL0_ABI___)
/* Windowed ABI: