2 files changed, 6 insertions, 12 deletions
diff --git a/libcpu/SConscript b/libcpu/SConscript
index 4fea918603..a9b1eca794 100644
--- a/libcpu/SConscript
+++ b/libcpu/SConscript
@@ -1,5 +1,6 @@
 Import('env')
 Import('rtconfig')
+Import('RTT_ROOT')
 
 comm = rtconfig.ARCH + '/common'
 path = rtconfig.ARCH + '/' + rtconfig.CPU
@@ -14,5 +15,7 @@ if rtconfig.CC == 'gcc':
 if rtconfig.CC == 'iar':
 	src_local = Glob(path + '/*.c') + Glob(path + '/*_iar.s') + Glob(comm + '/*.c')
 
+env.Append(CPPPATH = [RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU])
 obj = env.Object(src_local)
+
 Return('obj')
diff --git a/libcpu/arm/stm32/start_gcc.s b/libcpu/arm/stm32/start_gcc.s
index 78c10c3c49..eaecc16fd3 100644
--- a/libcpu/arm/stm32/start_gcc.s
+++ b/libcpu/arm/stm32/start_gcc.s
@@ -143,7 +143,7 @@ g_pfnVectors:
   .word  Initial_spTop
   .word  Reset_Handler
   .word  NMI_Handler
-  .word  HardFault_Handler
+  .word  rt_hw_hard_fault
   .word  MemManage_Handler
   .word  BusFault_Handler
   .word  UsageFault_Handler
@@ -154,8 +154,8 @@ g_pfnVectors:
   .word  SVC_Handler
   .word  DebugMon_Handler
   .word  0
-  .word  PendSV_Handler
-  .word  SysTick_Handler
+  .word  rt_hw_pend_sv
+  .word  rt_hw_timer_handler
   .word  WWDG_IRQHandler
   .word  PVD_IRQHandler
   .word  TAMPER_IRQHandler
@@ -274,9 +274,6 @@ g_pfnVectors:
   .weak  NMI_Handler
   .thumb_set NMI_Handler,Default_Handler
   
-  .weak  HardFault_Handler
-  .thumb_set HardFault_Handler,Default_Handler
-  
   .weak  MemManage_Handler
   .thumb_set MemManage_Handler,Default_Handler
   
@@ -292,12 +289,6 @@ g_pfnVectors:
   .weak  DebugMon_Handler
   .thumb_set DebugMon_Handler,Default_Handler
 
-  .weak  PendSV_Handler
-  .thumb_set PendSV_Handler,Default_Handler
-
-  .weak  SysTick_Handler
-  .thumb_set SysTick_Handler,Default_Handler
-
   .weak  WWDG_IRQHandler
   .thumb_set WWDG_IRQHandler,Default_Handler