diff --git a/zksync_os/src/asm/asm_reduced.S b/zksync_os/src/asm/asm_reduced.S index b6665fbae..ffdd2260b 100644 --- a/zksync_os/src/asm/asm_reduced.S +++ b/zksync_os/src/asm/asm_reduced.S @@ -41,9 +41,9 @@ _abs_start: Machine trap entry point (_machine_start_trap) */ .section .trap, "ax" -.global machine_default_start_trap +.global _machine_start_trap .align 4 -machine_default_start_trap: +_machine_start_trap: // We assume that exception stack is always saved to MSCRATCH // so we swap it with x31 diff --git a/zksync_os/src/lds/link.x b/zksync_os/src/lds/link.x index 2f8645e67..71efad94b 100644 --- a/zksync_os/src/lds/link.x +++ b/zksync_os/src/lds/link.x @@ -34,7 +34,6 @@ PROVIDE(_setup_interrupts = default_setup_interrupts); but by providing the `_start_trap` symbol external crates can override. */ PROVIDE(_start_trap = default_start_trap); -PROVIDE(_machine_start_trap = machine_default_start_trap); PHDRS { diff --git a/zksync_os/src/main.rs b/zksync_os/src/main.rs index f459b0dfa..f58808f6d 100644 --- a/zksync_os/src/main.rs +++ b/zksync_os/src/main.rs @@ -237,7 +237,6 @@ pub unsafe fn custom_setup_interrupts() { /// Exception (trap) handler in rust. /// Currently not supported. -// TODO(EVM-1189): remove machine_default_start_trap entry point to binary. #[link_section = ".trap.rust"] #[export_name = "_machine_start_trap_rust"] pub extern "C" fn machine_start_trap_rust(trap_frame: *mut MachineTrapFrame) -> usize {