michaelh/zephyr
1
0
Fork 0
Code Releases Activity

build: namespace syscall sources to zephyr/

Browse source 
Namespace the `syscall_dispatch.c` & `syscall_export_llext.c`
to `zephyr/` as well

Signed-off-by: Yong Cong Sin <ycsin@meta.com>
This commit is contained in:
Yong Cong Sin 2024-05-24 22:09:31 +08:00 • committed by Henrik Brix Andersen
commit 3570408db5
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -801,15 +801,15 @@ if(CONFIG_LEGACY_GENERATED_INCLUDE_PATH)
${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h) ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h)
endif() endif()
add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h} add_custom_command(OUTPUT include/generated/zephyr/syscall_dispatch.c ${syscall_list_h}
# Also, some files are written to include/generated/zephyr/syscalls/ # Also, some files are written to include/generated/zephyr/syscalls/
COMMAND COMMAND
${PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/build/gen_syscalls.py ${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
--json-file ${syscalls_json} # Read this file --json-file ${syscalls_json} # Read this file
--base-output include/generated/zephyr/syscalls # Write to this dir --base-output include/generated/zephyr/syscalls # Write to this dir
--syscall-dispatch include/generated/syscall_dispatch.c # Write this file --syscall-dispatch include/generated/zephyr/syscall_dispatch.c # Write this file
--syscall-export-llext include/generated/syscall_export_llext.c --syscall-export-llext include/generated/zephyr/syscall_export_llext.c
--syscall-list ${syscall_list_h} --syscall-list ${syscall_list_h}
$<$<BOOL:${CONFIG_USERSPACE}>:--gen-mrsh-files> $<$<BOOL:${CONFIG_USERSPACE}>:--gen-mrsh-files>
${SYSCALL_LONG_REGISTERS_ARG} ${SYSCALL_LONG_REGISTERS_ARG}
@ -2121,7 +2121,7 @@ add_custom_command(
${ZEPHYR_BASE}/scripts/build/gen_syscalls.py ${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
--json-file ${syscalls_json} # Read this file --json-file ${syscalls_json} # Read this file
--base-output edk/include/generated/zephyr/syscalls # Write to this dir --base-output edk/include/generated/zephyr/syscalls # Write to this dir
--syscall-dispatch edk/include/generated/syscall_dispatch.c # Write this file --syscall-dispatch edk/include/generated/zephyr/syscall_dispatch.c # Write this file
--syscall-list ${edk_syscall_list_h} --syscall-list ${edk_syscall_list_h}
$<$<BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY}>:--userspace-only> $<$<BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY}>:--userspace-only>
${SYSCALL_LONG_REGISTERS_ARG} ${SYSCALL_LONG_REGISTERS_ARG}

2
doc/kernel/usermode/syscalls.rst
View file

@ -147,7 +147,7 @@ the project out directory under ``include/generated/``:
of the API in uppercase, prefixed with ``K_SYSCALL_``. of the API in uppercase, prefixed with ``K_SYSCALL_``.
* An entry for the system call is created in the dispatch table * An entry for the system call is created in the dispatch table
``_k_syscall_table``, expressed in ``include/generated/syscall_dispatch.c`` ``_k_syscall_table``, expressed in ``include/generated/zephyr/syscall_dispatch.c``
* This table only contains syscalls where their corresponding * This table only contains syscalls where their corresponding
prototypes are declared in header files when prototypes are declared in header files when

2
doc/releases/migration-guide-3.7.rst
View file

@ -48,7 +48,7 @@ Build System
* - ``version.h`` * - ``version.h``
* - ``zsr.h`` * - ``zsr.h``
and syscall headers are now namespaced into the ``zephyr/`` folder. The change is largely as well as syscall headers & sources are now namespaced into the ``zephyr/`` folder. The change is largely
automated, and the script can be found in :github:`63973`. automated, and the script can be found in :github:`63973`.
For the time being, the compatibility Kconfig (:kconfig:option:`CONFIG_LEGACY_GENERATED_INCLUDE_PATH`) For the time being, the compatibility Kconfig (:kconfig:option:`CONFIG_LEGACY_GENERATED_INCLUDE_PATH`)
is enabled by default so that downstream applications will continue to compile, a warning message is enabled by default so that downstream applications will continue to compile, a warning message

2
kernel/userspace.c
View file

@ -1014,4 +1014,4 @@ static uintptr_t handler_no_syscall(uintptr_t arg1, uintptr_t arg2,
CODE_UNREACHABLE; /* LCOV_EXCL_LINE */ CODE_UNREACHABLE; /* LCOV_EXCL_LINE */
} }
#include <syscall_dispatch.c> #include <zephyr/syscall_dispatch.c>

2
subsys/llext/llext_export.c
View file

@ -16,4 +16,4 @@ EXPORT_SYMBOL(memcmp);
EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memcpy);
EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memset);
#include <syscall_export_llext.c> #include <zephyr/syscall_export_llext.c>