diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-03-31 15:03:25 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-03-31 15:03:25 +0000 |
| commit | d209f631a56dcf5cf2032cb51054969221736a02 (patch) | |
| tree | fd9e92305088f82fb1fdf0e009e2edc1b804aab1 | |
| parent | c5569d8fc9baaf08e1576bf4dd5eb0b990d86153 (diff) | |
| download | ChibiOS-d209f631a56dcf5cf2032cb51054969221736a02.tar.gz ChibiOS-d209f631a56dcf5cf2032cb51054969221736a02.tar.bz2 ChibiOS-d209f631a56dcf5cf2032cb51054969221736a02.zip | |
Fixed bug 2700695.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@859 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/board.c | 6 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-WEB-GCC/board.c | 6 | ||||
| -rw-r--r-- | ports/ARM7-AT91SAM7X/vectors.s | 3 | ||||
| -rw-r--r-- | 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
|