cmake:fix protected build link option break,init canmv230 protected

build

Signed-off-by: xuxin19 <[email protected]>

Author: xuxin930

CMakeLists.txt

@@ -758,8 +758,14 @@ if(CONFIG_BUILD_PROTECTED)
     OUTPUT_VARIABLE nuttx_user_libgcc)
 
   # reset link options for userspace to prevent sections from being accidentally
-  # deleted
-  set_target_properties(nuttx_user PROPERTIES LINK_OPTIONS "")
+  # deleted Toolchain link options
+  get_target_property(nuttx_user_LINK_OPTIONS nuttx_user LINK_OPTIONS)
+  list(REMOVE_ITEM nuttx_user_LINK_OPTIONS "-Wl,--gc-sections")
+  list(REMOVE_ITEM nuttx_user_LINK_OPTIONS "-Wl,--cref")
+  list(REMOVE_ITEM nuttx_user_LINK_OPTIONS "-Wl,-Map=nuttx.map")
+  list(REMOVE_ITEM nuttx_user_LINK_OPTIONS "-Wl,--entry=__start")
+  set_target_properties(nuttx_user PROPERTIES LINK_OPTIONS
+                                              "${nuttx_user_LINK_OPTIONS}")
 
   target_link_options(
     nuttx_user PRIVATE -nostartfiles -nodefaultlibs

boards/risc-v/k230/canmv230/CMakeLists.txt

@@ -19,3 +19,10 @@
 # ##############################################################################
 
 add_subdirectory(src)
+
+if(CONFIG_BUILD_PROTECTED)
+  add_subdirectory(kernel)
+  set_property(
+    GLOBAL PROPERTY LD_SCRIPT_USER
+                    ${CMAKE_CURRENT_LIST_DIR}/scripts/ld-userland.script)
+endif()

boards/risc-v/k230/canmv230/kernel/CMakeLists.txt

@@ -0,0 +1,23 @@
+# ##############################################################################
+# boards/risc-v/k230/canmv230/kernel/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.
+#
+# ##############################################################################
+
+target_link_options(nuttx_user PRIVATE "-Wl,-melf64lriscv")
+
+target_sources(nuttx_user PRIVATE k230_userspace.c)

libs/libc/spawn/CMakeLists.txt

@@ -29,26 +29,21 @@ set(SRCS
     lib_psa_getschedparam.c
     lib_psa_getschedpolicy.c
     lib_psa_init.c
-    lib_psa_destroy.c
     lib_psa_setflags.c
     lib_psa_setschedparam.c
     lib_psa_setschedpolicy.c
     lib_psa_getsigmask.c
-    lib_psa_setsigmask.c)
-
-if(CONFIG_DEBUG_FEATURES)
-  list(APPEND SRCS lib_psfa_dump.c)
-endif()
+    lib_psa_setsigmask.c
+    lib_psa_getstacksize.c
+    lib_psa_setstacksize.c
+    lib_psa_destroy.c)
 
 if(NOT CONFIG_BUILD_KERNEL)
-  list(APPEND SRCS lib_psa_getstacksize.c lib_psa_setstacksize.c)
-  if(CONFIG_LIB_SYSCALL)
-    list(APPEND SRCS lib_task_spawn.c)
-  endif()
+  list(APPEND SRCS lib_psa_getstackaddr.c lib_psa_setstackaddr.c)
 endif()
 
 if(CONFIG_DEBUG_FEATURES)
-  list(APPEND SRCS lib_psa_dump.c)
+  list(APPEND SRCS lib_psfa_dump.c lib_psa_dump.c)
 endif()
 
 target_sources(c PRIVATE ${SRCS})