MSVC prefers the attrib at the beginning

diff --git a/src/rose/program_runtime.h b/src/rose/program_runtime.h
index 198b8e1371d3b8b2f42ed1421a53e34bf5ed6a73..b9036422b3eae85deae54831f3b3cacfa8b36946 100644 (file)
--- a/src/rose/program_runtime.h
+++ b/src/rose/program_runtime.h
@@ -864,7 +864,7 @@ m128 getData128(const struct core_info *ci, s64a offset, u16 *valid_data_mask) {
         *valid_data_mask = 0xffff;
         return loadu128(ci->buf + offset);
     }
-    u8 data[sizeof(m128)] ALIGN_DIRECTIVE;
+    ALIGN_DIRECTIVE u8 data[sizeof(m128)];
     *valid_data_mask = (u16)getBufferDataComplex(ci, offset, data, 16);
     return *(m128 *)data;
 }
@@ -875,7 +875,7 @@ m256 getData256(const struct core_info *ci, s64a offset, u32 *valid_data_mask) {
         *valid_data_mask = ~0u;
         return loadu256(ci->buf + offset);
     }
-    u8 data[sizeof(m256)] ALIGN_DIRECTIVE;
+    ALIGN_DIRECTIVE u8 data[sizeof(m256)];
     *valid_data_mask = getBufferDataComplex(ci, offset, data, 32);
     return *(m256 *)data;
 }

diff --git a/src/util/simd_utils.c b/src/util/simd_utils.c
index a86c568db28856d050e04c130f5b1a5515a5c398..54b5b4baadf5b283613e57af11fa2099977b5d73 100644 (file)
--- a/src/util/simd_utils.c
+++ b/src/util/simd_utils.c
@@ -32,7 +32,7 @@
 
 #include "simd_utils.h"
 
-const char vbs_mask_data[] ALIGN_CL_DIRECTIVE = {
+ALIGN_CL_DIRECTIVE const char vbs_mask_data[] = {
     0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
     0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
 
@@ -48,7 +48,7 @@ const char vbs_mask_data[] ALIGN_CL_DIRECTIVE = {
 #define ZEROES_32 ZEROES_8, ZEROES_8, ZEROES_8, ZEROES_8
 
 /** \brief LUT for the mask1bit functions. */
-const u8 simd_onebit_masks[] ALIGN_CL_DIRECTIVE = {
+ALIGN_CL_DIRECTIVE const u8 simd_onebit_masks[] = {
     ZEROES_31, 0x01, ZEROES_32,
     ZEROES_31, 0x02, ZEROES_32,
     ZEROES_31, 0x04, ZEROES_32,