Index: apps/codecs/libcook/cook.h
===================================================================
--- apps/codecs/libcook/cook.h	(revision 29879)
+++ apps/codecs/libcook/cook.h	(working copy)
@@ -86,13 +86,13 @@
 
     /* data buffers */
 
-    uint8_t             decoded_bytes_buffer[1024];
-    REAL_T mono_mdct_output[2048] __attribute__ ((aligned(16)));
-    REAL_T              mono_previous_buffer1[1024];
-    REAL_T              mono_previous_buffer2[1024];
-    REAL_T              decode_buffer_1[1024];
-    REAL_T              decode_buffer_2[1024];
-    REAL_T              decode_buffer_0[1060]; /* static allocation for joint decode */
+    uint8_t             decoded_bytes_buffer[1024] MEM_ALIGN_ATTR;
+    REAL_T              mono_mdct_output[2048] MEM_ALIGN_ATTR;
+    REAL_T              mono_previous_buffer1[1024] MEM_ALIGN_ATTR;
+    REAL_T              mono_previous_buffer2[1024] MEM_ALIGN_ATTR;
+    REAL_T              decode_buffer_1[1024] MEM_ALIGN_ATTR;
+    REAL_T              decode_buffer_2[1024] MEM_ALIGN_ATTR;
+    REAL_T              decode_buffer_0[1060] MEM_ALIGN_ATTR; /* static allocation for joint decode */
 } COOKContext;
 
 int cook_decode_init(RMContext *rmctx, COOKContext *q);
Index: apps/codecs/libcook/cookdata_fixpoint.h
===================================================================
--- apps/codecs/libcook/cookdata_fixpoint.h	(revision 29879)
+++ apps/codecs/libcook/cookdata_fixpoint.h	(working copy)
@@ -39,7 +39,7 @@
 typedef struct {
 } realvars_t;
 
-static const FIXPU pow128_tab[128] = {
+static const FIXPU pow128_tab[128] ICONST_ATTR = {
     /* x_i = 2^(15+i/128) */
     0x8000, 0x80b2, 0x8165, 0x8219, 0x82ce, 0x8383, 0x843a, 0x84f2, 0x85ab,
     0x8665, 0x871f, 0x87db, 0x8898, 0x8956, 0x8a15, 0x8ad5, 0x8b96, 0x8c58,
@@ -131,27 +131,27 @@
     0x00000000, 0x00000000
 }}};
 
-static const FIXPU cplscale2[3] = {
+static const FIXPU cplscale2[3] ICONST_ATTR = {
     /* 2^16 C_ij */
     0xf3f9, 0xb505, 0x4d8b
 };
-static const FIXPU cplscale3[7] = {
+static const FIXPU cplscale3[7] ICONST_ATTR = {
     /* 2^16 C_ij */
     0xfb35, 0xefdf, 0xe03d, 0xb505, 0x7b81, 0x596e, 0x314d
 };
-static const FIXPU cplscale4[15] = {
+static const FIXPU cplscale4[15] ICONST_ATTR = {
     /* 2^16 C_ij */
     0xfdd2, 0xf927, 0xf3f9, 0xee1d, 0xe749, 0xdee9, 0xd381, 0xb505, 0x903b,
     0x7de2, 0x6dbe, 0x5e02, 0x4d8b, 0x3ad1, 0x2155
 };
-static const FIXPU cplscale5[31] = {
+static const FIXPU cplscale5[31] ICONST_ATTR = {
     /* 2^16 C_ij */
     0xfef5, 0xfcce, 0xfa8e, 0xf832, 0xf5b5, 0xf314, 0xf049, 0xed4c, 0xea12,
     0xe68e, 0xe2ab, 0xde4b, 0xd938, 0xd30b, 0xcab6, 0xb505, 0x9c59, 0x90e8,
     0x8778, 0x7ef9, 0x76fc, 0x6f45, 0x67ab, 0x600e, 0x5850, 0x504d, 0x47db,
     0x3ebd, 0x3486, 0x2853, 0x1715
 };
-static const FIXPU cplscale6[63] = {
+static const FIXPU cplscale6[63] ICONST_ATTR = {
     /* 2^16 C_ij */
     0xff7d, 0xfe74, 0xfd65, 0xfc50, 0xfb35, 0xfa14, 0xf8eb, 0xf7bb, 0xf683,
     0xf543, 0xf3f9, 0xf2a6, 0xf148, 0xefdf, 0xee6a, 0xece6, 0xeb54, 0xe9b2,