3 files changed, 2 insertions, 32 deletions
diff --git a/ports/ARM7-LPC214x/GCC/chcore.c b/ports/ARM7-LPC214x/GCC/chcore.c
index 11f407627..51ead6542 100644
--- a/ports/ARM7-LPC214x/GCC/chcore.c
+++ b/ports/ARM7-LPC214x/GCC/chcore.c
@@ -40,33 +40,6 @@ void chSysPuts(char *msg) {
 }
 
 /*
- * Non-vectored IRQs handling here.
- */
-__attribute__((naked, weak))
-void IrqHandler(void) {
-
-  chSysIRQEnterI();
-
-  /* nothing */
-
-  chSysIRQExitI();
-}
-
-/*
- * Timer 0 IRQ handling here.
- */
-__attribute__((naked, weak))
-void T0IrqHandler(void) {
-
-  chSysIRQEnterI();
-
-  T0IR = 1;             /* Clear interrupt on match MR0. */
-  chSysTimerHandlerI();
-
-  chSysIRQExitI();
-}
-
-/*
  * Common IRQ exit code, \p chSysIRQExitI() just jumps here.
  *
  * System stack frame structure after a context switch in the
diff --git a/ports/ARM7-LPC214x/GCC/chcore2.s b/ports/ARM7-LPC214x/GCC/chcore2.s
index ee1e6ad55..a31422cea 100644
--- a/ports/ARM7-LPC214x/GCC/chcore2.s
+++ b/ports/ARM7-LPC214x/GCC/chcore2.s
@@ -32,9 +32,9 @@
 
 .text
 .code 32
-.balign 4
 
 #ifdef THUMB
+.balign 16
 .globl chSysLock
 chSysLock:
         msr     CPSR_c, #MODE_SYS | I_BIT
@@ -46,6 +46,7 @@ chSysUnlock:
         bx      lr
 #endif
 
+.balign 16
 .globl chSysSwitchI
 chSysSwitchI:
 #ifdef CH_CURRP_REGISTER_CACHE
diff --git a/ports/ARM7-LPC214x/GCC/crt0.s b/ports/ARM7-LPC214x/GCC/crt0.s
index b58e189e8..27e2eefcf 100644
--- a/ports/ARM7-LPC214x/GCC/crt0.s
+++ b/ports/ARM7-LPC214x/GCC/crt0.s
@@ -136,8 +136,6 @@ bssloop:
         mov     r1, r0
         bl      main
         bl      chSysHalt
-.weak hwinit
-hwinit: bx      lr
 #else
         add     r0, pc, #1
         bx      r0
@@ -147,8 +145,6 @@ hwinit: bx      lr
         mov     r1, r0
         bl      main
         bl      chSysHalt
-.weak hwinit
-hwinit: bx      lr
 .code 32
 #endif