From d209f631a56dcf5cf2032cb51054969221736a02 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 31 Mar 2009 15:03:25 +0000
Subject: [PATCH] Fixed bug 2700695.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@859 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/ARM7-AT91SAM7X-GCC/board.c     | 6 ++----
 demos/ARM7-AT91SAM7X-WEB-GCC/board.c | 6 ++----
 ports/ARM7-AT91SAM7X/vectors.s       | 3 +++
 readme.txt                           | 3 ++-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c
index 21e9665f2..43c624d9a 100644
--- a/demos/ARM7-AT91SAM7X-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-GCC/board.c
@@ -25,11 +25,9 @@
 #include <sam7x_serial.h>
 
 /*
- * FIQ Handler, unused in this demo.
+ * FIQ Handler weak symbol defined in vectors.s.
  */
-__attribute__((interrupt("FIQ")))
-static void FiqHandler(void) {
-}
+void FiqHandler(void);
 
 static CH_IRQ_HANDLER(SpuriousHandler) {
 
diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/board.c b/demos/ARM7-AT91SAM7X-WEB-GCC/board.c
index 8f9a45af4..630a0ad5d 100644
--- a/demos/ARM7-AT91SAM7X-WEB-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-WEB-GCC/board.c
@@ -26,11 +26,9 @@
 #include <sam7x_emac.h>
 
 /*
- * FIQ Handler, unused in this demo.
+ * FIQ Handler weak symbol defined in vectors.s.
  */
-__attribute__((interrupt("FIQ")))
-static void FiqHandler(void) {
-}
+void FiqHandler(void);
 
 static CH_IRQ_HANDLER(SpuriousHandler) {
 
diff --git a/ports/ARM7-AT91SAM7X/vectors.s b/ports/ARM7-AT91SAM7X/vectors.s
index a16fa252d..29271daf1 100644
--- a/ports/ARM7-AT91SAM7X/vectors.s
+++ b/ports/ARM7-AT91SAM7X/vectors.s
@@ -68,4 +68,7 @@ PrefetchHandler:
 .weak AbortHandler
 AbortHandler:
 
+.weak FiqHandler
+FiqHandler:
+
 .loop:  b       .loop
diff --git a/readme.txt b/readme.txt
index 2aac0ab07..ba22f958c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -75,7 +75,8 @@ Win32-MinGW            - ChibiOS/RT simulator and demo into a WIN32 process,
 *** 1.1.3unstable ***
 - FIX: Fixed makefile in STM32 demo, this bug was reported fixed in
   version 1.1.2 but it was still there (bug 2686451).
-- FIX: Fixed makefile in MSP430 demo (bug 2700690).
+- FIX: Fixed makefile in MSP430 demo (bug 2700690).
+- FIX: Fixed thumb mode build error in AT91SAM7X demos (bug 2700695).
 
 *** 1.1.2unstable ***
 - FIX: Fixed priority inheritance problem with condvars (bug 2674756) and