From 4130d9a2d77ed2ccd3940f22b3070db45864e566 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 3 Sep 2010 11:58:29 +0000
Subject: [PATCH] Fixed bug 3056866.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.0.x@2156 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 docs/Doxyfile             | 2 +-
 os/kernel/include/ch.h    | 4 ++--
 os/ports/GCC/ARM/rules.mk | 2 +-
 readme.txt                | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/Doxyfile b/docs/Doxyfile
index 33ca27982..17bf96b86 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.0.3
+PROJECT_NUMBER         = 2.0.4
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 5de1e95b3..ed3237b1b 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -46,7 +46,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "2.0.3"
+#define CH_KERNEL_VERSION       "2.0.4"
 
 /**
  * @brief   Kernel version major number.
@@ -61,7 +61,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         3
+#define CH_KERNEL_PATCH         4
 
 /*
  * Common values.
diff --git a/os/ports/GCC/ARM/rules.mk b/os/ports/GCC/ARM/rules.mk
index 8ccdbefca..5e8b8e971 100644
--- a/os/ports/GCC/ARM/rules.mk
+++ b/os/ports/GCC/ARM/rules.mk
@@ -83,7 +83,7 @@ ifneq ($(TSRC),)
   endif
 else
   # Pure ARM mode
-  CPFLAGS += -mno-thumb-interwork
+  CFLAGS += -mno-thumb-interwork
   CPPFLAGS += -mno-thumb-interwork
   ASFLAGS += -mno-thumb-interwork
   LDFLAGS += -mno-thumb-interwork
diff --git a/readme.txt b/readme.txt
index 080b315e2..79c19a358 100644
--- a/readme.txt
+++ b/readme.txt
@@ -58,6 +58,9 @@
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 2.0.4 ***
+- FIX: Fixed reduced ARM7 performance with GCC 4.5.x (bug 3056866).
+
 *** 2.0.3 ***
 - Tests reports regenerated using GCC 4.5.1, small performance improvements
   in all benchmarks.