Skip to content

Commit 58d4281

Browse files
Apply changes as per PR thread
Co-authored-by: Román Cárdenas Rodríguez <[email protected]>
1 parent f50acd1 commit 58d4281

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

riscv-rt/link.x.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424

2525
/* Default abort entry point. If no abort symbol is provided, then abort maps to _abort. */
26-
EXTERN(_abort);
27-
PROVIDE(abort = _abort);
26+
EXTERN(_default_abort);
27+
PROVIDE(abort = _default_abort);
2828

2929
/* Default trap entry point. The riscv-rt crate provides a weak alias of this function,
3030
which saves caller saved registers, calls _start_trap_rust, restores caller saved registers

riscv-rt/src/asm.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ riscv_rt_macros::vectored_interrupt_trap!();
268268
#[rustfmt::skip]
269269
global_asm!(
270270
".section .text.abort
271-
.global _abort
272-
_abort: // make sure there is an abort symbol when linking
273-
j _abort"
271+
.global _default_abort
272+
_default_abort: // make sure there is an abort symbol when linking
273+
j _default_abort"
274274
);

0 commit comments

Comments
 (0)