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/10/12 18:25:16 UTC

(nuttx) 03/03: cmake:sync arm sub arch CMake scripts missing sources

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 7def0983f6f5ae6ab7058b72bd974298b90af662
Author: xuxin19 <xu...@xiaomi.com>
AuthorDate: Thu Sep 5 20:41:42 2024 +0800

    cmake:sync arm sub arch CMake scripts missing sources
    
    Signed-off-by: xuxin19 <xu...@xiaomi.com>
---
 arch/arm/src/arm/CMakeLists.txt     | 45 +++++++++++++++++++++++++++++++++++++
 arch/arm/src/armv7-a/CMakeLists.txt |  5 +----
 arch/arm/src/armv7-m/CMakeLists.txt |  5 +----
 arch/arm/src/armv8-m/CMakeLists.txt |  5 +----
 4 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/arch/arm/src/arm/CMakeLists.txt b/arch/arm/src/arm/CMakeLists.txt
new file mode 100644
index 0000000000..9a6eb48281
--- /dev/null
+++ b/arch/arm/src/arm/CMakeLists.txt
@@ -0,0 +1,45 @@
+# ##############################################################################
+# arch/arm/src/arm/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+set(SRCS arm_head.S)
+
+list(
+  APPEND
+  SRCS
+  arm_dataabort.c
+  arm_doirq.c
+  arm_initialstate.c
+  arm_prefetchabort.c
+  arm_schedulesigaction.c
+  arm_sigdeliver.c
+  arm_syscall.c
+  arm_tcbinfo.c
+  arm_undefinedinsn.c
+  arm_cache.S
+  arm_vectors.S
+  arm_vectortab.S
+  arm_saveusercontext.S)
+
+if(CONFIG_PAGING)
+  list(APPEND SRCS arm_pginitialize.c arm_checkmapping.c arm_allocpage.c
+       arm_va2pte.c)
+endif()
+
+target_sources(arch PRIVATE ${SRCS})
diff --git a/arch/arm/src/armv7-a/CMakeLists.txt b/arch/arm/src/armv7-a/CMakeLists.txt
index 748ef82a8e..bc43a871ab 100644
--- a/arch/arm/src/armv7-a/CMakeLists.txt
+++ b/arch/arm/src/armv7-a/CMakeLists.txt
@@ -46,12 +46,9 @@ list(
   arm_syscall.c
   arm_tcbinfo.c
   arm_undefinedinsn.c
+  arm_perf.c
   cp15_cacheops.c)
 
-if(CONFIG_ARCH_PERF_EVENTS)
-  list(APPEND SRCS arm_perf.c)
-endif()
-
 if(CONFIG_ARMV7A_GICv2M)
   list(APPEND SRCS arm_gicv2m.c)
 endif()
diff --git a/arch/arm/src/armv7-m/CMakeLists.txt b/arch/arm/src/armv7-m/CMakeLists.txt
index 49be110409..1dc4dbbd14 100644
--- a/arch/arm/src/armv7-m/CMakeLists.txt
+++ b/arch/arm/src/armv7-m/CMakeLists.txt
@@ -32,6 +32,7 @@ set(SRCS
     arm_initialstate.c
     arm_itm.c
     arm_memfault.c
+    arm_perf.c
     arm_schedulesigaction.c
     arm_sigdeliver.c
     arm_svcall.c
@@ -41,10 +42,6 @@ set(SRCS
     arm_usagefault.c
     arm_vectors.c)
 
-if(CONFIG_ARCH_PERF_EVENTS)
-  list(APPEND SRCS arm_perf.c)
-endif()
-
 if(CONFIG_ARMV7M_SYSTICK)
   list(APPEND SRCS arm_systick.c)
 endif()
diff --git a/arch/arm/src/armv8-m/CMakeLists.txt b/arch/arm/src/armv8-m/CMakeLists.txt
index eed1feb3d8..37112596b5 100644
--- a/arch/arm/src/armv8-m/CMakeLists.txt
+++ b/arch/arm/src/armv8-m/CMakeLists.txt
@@ -30,6 +30,7 @@ set(SRCS
     arm_initialstate.c
     arm_itm.c
     arm_memfault.c
+    arm_perf.c
     arm_sau.c
     arm_schedulesigaction.c
     arm_securefault.c
@@ -42,10 +43,6 @@ set(SRCS
     arm_usagefault.c
     arm_vectors.c)
 
-if(CONFIG_ARCH_PERF_EVENTS)
-  list(APPEND SRCS arm_perf.c)
-endif()
-
 if(CONFIG_ARMV8M_SYSTICK)
   list(APPEND SRCS arm_systick.c)
 endif()