Skip to content

Fix IAR cmsis update breakage #15016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2021
Merged

Fix IAR cmsis update breakage #15016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77f8a30
cmsis: fix iar asm build error with including header
0xc0170 Aug 20, 2021
19f2138
cmsis importer: add IAR fix for .S files
0xc0170 Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
NAME irq_armv6m.s


#include "rtx_def.h"

I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
TCB_SP_OFS EQU 56 ; TCB.SP offset
Expand Down
1 change: 0 additions & 1 deletion cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
NAME irq_armv6m.s


#include "rtx_def.h"

I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
TCB_SP_OFS EQU 56 ; TCB.SP offset
Expand Down
1 change: 0 additions & 1 deletion cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
NAME irq_armv8mbl.s


#include "rtx_def.h"

#ifndef DOMAIN_NS
#define DOMAIN_NS 0
Expand Down
1 change: 0 additions & 1 deletion cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
NAME irq_armv7m.s


#include "rtx_def.h"

#ifdef __ARMVFP__
FPU_USED EQU 1
Expand Down
1 change: 0 additions & 1 deletion cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
NAME irq_armv8mml.s


#include "rtx_def.h"

#ifndef DOMAIN_NS
#define DOMAIN_NS 0
Expand Down
2 changes: 1 addition & 1 deletion cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
NAME irq_armv7m.s


#include "rtx_def.h"


#ifdef __ARMVFP__
FPU_USED EQU 1
Expand Down
3 changes: 2 additions & 1 deletion tools/importer/cmsis_importer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@
"fb354752eb69403ad503c8e53da67da6483776d6",
"08ab8cc47d8722bf0c767990cd615cf1c427d006",
"00580ce3f5d64b76342b7f26deed55e842056ea0",
"c122158d496d59fbd723bdb17bbc7bd5cc95245e"
"c122158d496d59fbd723bdb17bbc7bd5cc95245e",
"43a86f30450f8e9cec366434f6f752430847b4cf"
]
}