Skip to content

Commit 182fa95

Browse files
committed
More cortex-r-rt to aarch32-rt renames in error messages
1 parent d8d89e2 commit 182fa95

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

aarch32-rt-macros/src/lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -475,14 +475,12 @@ fn check_attr_whitelist(attrs: &[Attribute], caller: Kind) -> Result<(), TokenSt
475475
}
476476

477477
let err_str = match caller {
478-
Kind::Entry => {
479-
"this attribute is not allowed on a cortex-r-rt/cortex-a-rt entry point"
480-
}
478+
Kind::Entry => "this attribute is not allowed on an aarch32-rt entry point",
481479
Kind::Exception => {
482-
"this attribute is not allowed on an exception handler controlled by cortex-r-rt/cortex-a-rt"
480+
"this attribute is not allowed on an exception handler controlled by aarch32-rt"
483481
}
484482
Kind::Interrupt => {
485-
"this attribute is not allowed on an interrupt handler controlled by cortex-r-rt/cortex-a-rt"
483+
"this attribute is not allowed on an interrupt handler controlled by aarch32-rt"
486484
}
487485
};
488486

aarch32-rt/link.x

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ PROVIDE(_abt_stack_size = 0x400);
8989
PROVIDE(_irq_stack_size = 0x400);
9090
PROVIDE(_fiq_stack_size = 0x400);
9191

92-
ASSERT(_stack_top % 8 == 0, "ERROR(cortex-r-rt): top of stack is not 8-byte aligned");
93-
ASSERT(_und_stack_size % 8 == 0, "ERROR(cortex-r-rt): size of UND stack is not 8-byte aligned");
94-
ASSERT(_svc_stack_size % 8 == 0, "ERROR(cortex-r-rt): size of SVC stack is not 8-byte aligned");
95-
ASSERT(_abt_stack_size % 8 == 0, "ERROR(cortex-r-rt): size of ABT stack is not 8-byte aligned");
96-
ASSERT(_irq_stack_size % 8 == 0, "ERROR(cortex-r-rt): size of IRQ stack is not 8-byte aligned");
97-
ASSERT(_fiq_stack_size % 8 == 0, "ERROR(cortex-r-rt): size of FIQ stack is not 8-byte aligned");
92+
ASSERT(_stack_top % 8 == 0, "ERROR(aarch32-rt): top of stack is not 8-byte aligned");
93+
ASSERT(_und_stack_size % 8 == 0, "ERROR(aarch32-rt): size of UND stack is not 8-byte aligned");
94+
ASSERT(_svc_stack_size % 8 == 0, "ERROR(aarch32-rt): size of SVC stack is not 8-byte aligned");
95+
ASSERT(_abt_stack_size % 8 == 0, "ERROR(aarch32-rt): size of ABT stack is not 8-byte aligned");
96+
ASSERT(_irq_stack_size % 8 == 0, "ERROR(aarch32-rt): size of IRQ stack is not 8-byte aligned");
97+
ASSERT(_fiq_stack_size % 8 == 0, "ERROR(aarch32-rt): size of FIQ stack is not 8-byte aligned");
9898

9999
/* Weak aliases for ASM default handlers */
100100
PROVIDE(_start = _default_start);

0 commit comments

Comments
 (0)