From 5191c88eadb30a0ce0dab5ff17f76ba117d3c58c Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 24 Aug 2012 12:36:53 +0000
Subject: [PATCH] Fixed bug 3561279.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@4625 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/ports/IAR/ARMCMx/chtypes.h  | 7 +++----
 os/ports/RVCT/ARMCMx/chtypes.h | 7 +++----
 readme.txt                     | 3 +++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/os/ports/IAR/ARMCMx/chtypes.h b/os/ports/IAR/ARMCMx/chtypes.h
index 05aee3855..595f4f724 100644
--- a/os/ports/IAR/ARMCMx/chtypes.h
+++ b/os/ports/IAR/ARMCMx/chtypes.h
@@ -67,15 +67,14 @@ typedef int32_t         cnt_t;          /**< Resources counter.             */
 
 /**
  * @brief   Packed structure modifier (within).
- * @note    It uses the "packed" GCC attribute.
+ * @note    Empty in this port.
  */
-#define PACK_STRUCT_STRUCT __attribute__((packed))
+#define PACK_STRUCT_STRUCT
 
 /**
  * @brief   Packed structure modifier (before).
- * @note    Empty in this port.
  */
-#define PACK_STRUCT_BEGIN
+#define PACK_STRUCT_BEGIN __packed
 
 /**
  * @brief   Packed structure modifier (after).
diff --git a/os/ports/RVCT/ARMCMx/chtypes.h b/os/ports/RVCT/ARMCMx/chtypes.h
index 6cc0b1306..3c71d77e5 100644
--- a/os/ports/RVCT/ARMCMx/chtypes.h
+++ b/os/ports/RVCT/ARMCMx/chtypes.h
@@ -67,15 +67,14 @@ typedef int32_t         cnt_t;          /**< Resources counter.             */
 
 /**
  * @brief   Packed structure modifier (within).
- * @note    It uses the "packed" GCC attribute.
+ * @note    Empty in this port.
  */
-#define PACK_STRUCT_STRUCT __attribute__((packed))
+#define PACK_STRUCT_STRUCT
 
 /**
  * @brief   Packed structure modifier (before).
- * @note    Empty in this port.
  */
-#define PACK_STRUCT_BEGIN
+#define PACK_STRUCT_BEGIN __packed
 
 /**
  * @brief   Packed structure modifier (after).
diff --git a/readme.txt b/readme.txt
index b9abfef26..7b51b7ad5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,8 @@
 *****************************************************************************
 
 *** 2.4.3 ***
+- FIX: Fixed packed structures macros not functional in IAR and RVCT port
+  (bug 3561279).
 - FIX: Fixed Problem in FatFs demos related to LFN (bug 3560980).
 - NEW: I2C workaround allowing to read single byte on all STM32 platforms 
   except STM32F1xx.
@@ -449,6 +451,7 @@
   3031534).
 - FIX: Fixed wrong macro check in the STM32 SPI driver (bug 3028562).
 
+
 *** 2.0.2 ***
 - FIX: Fixed invalid context restore in MSP430 port (bug 3027975).
 - FIX: Fixed STM32 vectors file (bug 3026528).