riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14422 from maribu/cortexm_thread_arch

Browse Source 
cpu/cortexm_common: Fixes for thread_arch.c and dropped workaround
This commit is contained in:
Martine Lenders 2020-07-15 11:19:28 +02:00 committed by GitHub
commit 7cff1b915d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cpu/cortexm_common/Makefile
View File

@ -1,10 +1,3 @@
# thread_arch.c's inline assembler breaks when compiling with link time
# optimization. see https://github.com/RIOT-OS/RIOT/issues/5774.
SRC_NOLTO += thread_arch.c
# see https://github.com/RIOT-OS/RIOT/issues/5775.
SRC_NOLTO += vectors_cortexm.c
DIRS = periph DIRS = periph
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
cpu/cortexm_common/thread_arch.c
View File

@ -372,6 +372,8 @@ void __attribute__((naked)) __attribute__((used)) isr_pendsv(void) {
* causes end of exception*/ * causes end of exception*/
#endif #endif
/* {r0-r3,r12,LR,PC,xPSR,s0-s15,FPSCR} are restored automatically on exception return */ /* {r0-r3,r12,LR,PC,xPSR,s0-s15,FPSCR} are restored automatically on exception return */
".ltorg \n" /* literal pool needed to access
* sched_active_thread */
); );
} }