3 files changed, 4 insertions, 2 deletions
diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index c7177b094..5168f764a 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -79,7 +79,7 @@ ASRC = ../../ports/ARM7-LPC214x/chcore.c \
 TSRC =
 
 # List ASM source files here
-ASMSRC = ../../ports/ARM7-LPC214x/crt0.s
+ASMSRC = ../../ports/ARM7-LPC214x/crt0.s ../../ports/ARM7/chsys.s
 
 # List all user directories here
 UINCDIR = ../../src/include ../../src/lib \
diff --git a/demos/ARM7-LPC214x-GCC/Makefile.thumb b/demos/ARM7-LPC214x-GCC/Makefile.thumb
index 66d799ad9..a8840a293 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile.thumb
+++ b/demos/ARM7-LPC214x-GCC/Makefile.thumb
@@ -79,7 +79,7 @@ TSRC = ../../ports/ARM7-LPC214x/chcore.c \
        board.c buzzer.c mmcsd.c main.c
 
 # List ASM source files here
-ASMSRC = ../../ports/ARM7-LPC214x/crt0.s
+ASMSRC = ../../ports/ARM7-LPC214x/crt0.s ../../ports/ARM7/chsys.s
 
 # List all user directories here
 UINCDIR = ../../src/include ../../src/lib \
diff --git a/demos/ARM7-LPC214x-GCC/board.c b/demos/ARM7-LPC214x-GCC/board.c
index 23e642f01..94bc21336 100644
--- a/demos/ARM7-LPC214x-GCC/board.c
+++ b/demos/ARM7-LPC214x-GCC/board.c
@@ -37,6 +37,7 @@ static void IrqHandler(void) {
   chSysIRQEnterI();
 
   /* nothing */
+  VICVectAddr = 0;
 
   chSysIRQExitI();
 }
@@ -51,6 +52,7 @@ static void T0IrqHandler(void) {
 
   T0IR = 1;             /* Clear interrupt on match MR0. */
   chSysTimerHandlerI();
+  VICVectAddr = 0;
 
   chSysIRQExitI();
 }