diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-04-16 16:40:25 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-04-16 16:40:25 +0000 |
| commit | 119fe0414811fc2a1387c662e6583c9ad77abb44 (patch) | |
| tree | 7e4c84bec62ea73b71fc71ab198c38cf8273efcd /os/common | |
| parent | 11de5dcc881577bad6e3763c17c0fad4df27b7a3 (diff) | |
| download | ChibiOS-119fe0414811fc2a1387c662e6583c9ad77abb44.tar.gz ChibiOS-119fe0414811fc2a1387c662e6583c9ad77abb44.tar.bz2 ChibiOS-119fe0414811fc2a1387c662e6583c9ad77abb44.zip | |
IAR support restored.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9294 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common')
| -rw-r--r-- | os/common/ports/ARMCMx/chcore_v7m.h | 3 | ||||
| -rw-r--r-- | os/common/ports/ARMCMx/compilers/IAR/chtypes.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/os/common/ports/ARMCMx/chcore_v7m.h b/os/common/ports/ARMCMx/chcore_v7m.h index 668d9e3b0..066497d16 100644 --- a/os/common/ports/ARMCMx/chcore_v7m.h +++ b/os/common/ports/ARMCMx/chcore_v7m.h @@ -57,8 +57,9 @@ * @brief Working Areas alignment constant.
* @note It is the alignment to be enforced for thread working areas.
*/
-#define PORT_WORKING_AREA_ALIGN (PORT_ENABLE_GUARD_PAGES == TRUE ? \
+//#define PORT_WORKING_AREA_ALIGN (PORT_ENABLE_GUARD_PAGES == TRUE ? \
32U : PORT_STACK_ALIGN)
+#define PORT_WORKING_AREA_ALIGN 32
/** @} */
/**
diff --git a/os/common/ports/ARMCMx/compilers/IAR/chtypes.h b/os/common/ports/ARMCMx/compilers/IAR/chtypes.h index 07287e5cc..293389255 100644 --- a/os/common/ports/ARMCMx/compilers/IAR/chtypes.h +++ b/os/common/ports/ARMCMx/compilers/IAR/chtypes.h @@ -96,7 +96,7 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */ /**
* @brief Memory alignment enforcement for variables.
*/
-#define ALIGNED_VAR(n) _Pragma(__CH_STRINGIFY(data_alignment=##n))
+#define ALIGNED_VAR(n) _Pragma(__CH_STRINGIFY(data_alignment=n))
/**
* @brief Size of a pointer.
|