diff --git a/libcpu/arm/cortex-a/start_gcc.S b/libcpu/arm/cortex-a/start_gcc.S
index 1ed0d6166bc..6ff40b1b311 100644
--- a/libcpu/arm/cortex-a/start_gcc.S
+++ b/libcpu/arm/cortex-a/start_gcc.S
@@ -549,8 +549,8 @@ rt_hw_context_switch_interrupt_do:
     ldr     r6,  [r6]
     ldr     sp,  [r6]       /* get new task's stack pointer */
 
-    bl      rt_thread_self
 #ifdef RT_USING_SMART
+    bl      rt_thread_self
     mov     r4, r0
     bl      lwp_aspace_switch
     mov     r0, r4
@@ -622,8 +622,8 @@ vector_swi:
 vector_undef:
     push_svc_reg
     bl      rt_hw_trap_undef
-    cps     #Mode_UND
 #ifdef RT_USING_FPU
+    cps     #Mode_UND
     sub     sp, sp, #17 * 4
     ldr     lr, [sp, #15*4]
     ldmia   sp, {r0 - r12}