aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
Diffstat (limited to 'os')
-rw-r--r--os/common/ports/ARMCMx/chcore_v7m.h3
-rw-r--r--os/common/ports/ARMCMx/compilers/IAR/chtypes.h2
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.