This is an automated email from the ASF dual-hosted git repository.

masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 4fab2b9501 arch/armv7-[a|r]: Don't define fiq stack if 
CONFIG_ARMV7A_DECODEFIQ=n
4fab2b9501 is described below

commit 4fab2b9501d583bc98b23bf293475b526496a936
Author: Xiang Xiao <[email protected]>
AuthorDate: Mon Oct 17 23:34:55 2022 +0800

    arch/armv7-[a|r]: Don't define fiq stack if CONFIG_ARMV7A_DECODEFIQ=n
    
    Signed-off-by: Xiang Xiao <[email protected]>
---
 arch/arm/src/armv7-a/arm_vectors.S | 2 ++
 arch/arm/src/armv7-r/arm_vectors.S | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/arch/arm/src/armv7-a/arm_vectors.S 
b/arch/arm/src/armv7-a/arm_vectors.S
index 9cc6fe4d94..fb7c195c0f 100644
--- a/arch/arm/src/armv7-a/arm_vectors.S
+++ b/arch/arm/src/armv7-a/arm_vectors.S
@@ -753,6 +753,7 @@ g_intstacktop:
  *  Name: g_fiqstackalloc/g_fiqstacktop
  ****************************************************************************/
 
+#ifdef CONFIG_ARMV7A_DECODEFIQ
        .globl  g_fiqstackalloc
        .type   g_fiqstackalloc, object
        .globl  g_fiqstacktop
@@ -763,6 +764,7 @@ g_fiqstackalloc:
 g_fiqstacktop:
        .size   g_fiqstacktop, 0
        .size   g_fiqstackalloc, (CONFIG_ARCH_INTERRUPTSTACK & ~7)
+#endif
 
 #endif /* !CONFIG_SMP && CONFIG_ARCH_INTERRUPTSTACK > 7 */
        .end
diff --git a/arch/arm/src/armv7-r/arm_vectors.S 
b/arch/arm/src/armv7-r/arm_vectors.S
index 5f4fa8604e..3d5c7ef2b2 100644
--- a/arch/arm/src/armv7-r/arm_vectors.S
+++ b/arch/arm/src/armv7-r/arm_vectors.S
@@ -707,6 +707,7 @@ g_intstacktop:
  *  Name: g_fiqstackalloc/g_fiqstacktop
  ****************************************************************************/
 
+#ifdef CONFIG_ARMV7A_DECODEFIQ
        .globl  g_fiqstackalloc
        .type   g_fiqstackalloc, object
        .globl  g_fiqstacktop
@@ -717,6 +718,7 @@ g_fiqstackalloc:
 g_fiqstacktop:
        .size   g_fiqstacktop, 0
        .size   g_fiqstackalloc, (CONFIG_ARCH_INTERRUPTSTACK & ~7)
+#endif
 
 #endif /* CONFIG_ARCH_INTERRUPTSTACK > 7 */
        .end

Reply via email to