sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation of arm protected build

Browse Source 
Correct typos in include/nuttx/arch.h and suppress
"'noreturn' function does return" warning coming from arm_pthread_exit.c

Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
This commit is contained in:
Jukka Laitinen 2021-09-06 12:27:21 +03:00 committed by Xiang Xiao
parent 0368cbdf7c
commit 1b75b5d5aa
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/common/arm_pthread_exit.c
View File

@ -57,6 +57,10 @@ void up_pthread_exit(pthread_exitroutine_t exit, FAR void *exit_value)
/* Let sys_call2() do all of the work */ /* Let sys_call2() do all of the work */
sys_call2(SYS_pthread_exit, (uintptr_t)exit, (uintptr_t)exit_value); sys_call2(SYS_pthread_exit, (uintptr_t)exit, (uintptr_t)exit_value);
/* Suppress "'noreturn' function does return" warning */
while (1);
} }
#endif /* !CONFIG_BUILD_FLAT && __KERNEL__ && !CONFIG_DISABLE_PTHREAD */ #endif /* !CONFIG_BUILD_FLAT && __KERNEL__ && !CONFIG_DISABLE_PTHREAD */

4
arch/risc-v/src/common/riscv_pthread_exit.c
View File

@ -55,6 +55,10 @@
void up_pthread_exit(pthread_exitroutine_t exit, FAR void *exit_value) void up_pthread_exit(pthread_exitroutine_t exit, FAR void *exit_value)
{ {
sys_call2(SYS_pthread_exit, (uintptr_t)exit, (uintptr_t)exit_value); sys_call2(SYS_pthread_exit, (uintptr_t)exit, (uintptr_t)exit_value);
/* Suppress "'noreturn' function does return" warning */
while (1);
} }
#endif /* !CONFIG_BUILD_FLAT && __KERNEL__ && !CONFIG_DISABLE_PTHREAD */ #endif /* !CONFIG_BUILD_FLAT && __KERNEL__ && !CONFIG_DISABLE_PTHREAD */

4
include/nuttx/arch.h
View File

@ -614,7 +614,7 @@ void up_task_start(main_t taskentry, int argc, FAR char *argv[])
****************************************************************************/ ****************************************************************************/
void up_pthread_start(pthread_trampoline_t startup, void up_pthread_start(pthread_trampoline_t startup,
pthread_startroutine_t entrypt, pthread_addr_t arg); pthread_startroutine_t entrypt, pthread_addr_t arg)
noreturn_function; noreturn_function;
/**************************************************************************** /****************************************************************************
@ -633,7 +633,7 @@ void up_pthread_start(pthread_trampoline_t startup,
* None * None
****************************************************************************/ ****************************************************************************/
void up_pthread_exit(pthread_exitroutine_t exit, FAR void *exit_value); void up_pthread_exit(pthread_exitroutine_t exit, FAR void *exit_value)
noreturn_function; noreturn_function;
#endif #endif