From 0b3e4f25eea1eef3e8a45fdb6d1bcc1ec57d1321 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 17 Apr 2011 23:03:18 -0700
Subject: volk: replace references to __attribute__((aligned... with cross
 platform macro

This replaces all aligned(16) and aligned(128) (which were incorrect).

Attribute macros are on the left because this makes gcc and ms compilers happy.
---
 volk/lib/qa_16s_branch_4_state_8_aligned16.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'volk/lib/qa_16s_branch_4_state_8_aligned16.cc')

diff --git a/volk/lib/qa_16s_branch_4_state_8_aligned16.cc b/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
index 62deffaeb..2e6e6a1a0 100644
--- a/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
+++ b/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
@@ -29,22 +29,22 @@ void qa_16s_branch_4_state_8_aligned16::t1() {
   clock_t start, end;
   double total;
   
-  short target[vlen] __attribute__ ((aligned (16)));
-  short target2[vlen] __attribute__ ((aligned (16)));
-  short target3[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short target[vlen];
+  __VOLK_ATTR_ALIGNED(16) short target2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short target3[vlen];
   
-  short src0[vlen] __attribute__ ((aligned (16)));
-  short permute_indexes[vlen] __attribute__ ((aligned (16))) =  {
+  __VOLK_ATTR_ALIGNED(16) short src0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short permute_indexes[vlen] =  {
 7, 5, 2, 0, 6, 4, 3, 1, 6, 4, 3, 1, 7, 5, 2, 0, 1, 3, 4, 6, 0, 2, 5, 7, 0, 2, 5, 7, 1, 3, 4, 6 };
-  short cntl0[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl0[vlen] = {
     0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 };
-  short cntl1[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl1[vlen] = {
     0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 };
-  short cntl2[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl2[vlen] = {
     0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000 };
-  short cntl3[vlen] __attribute__ ((aligned (16))) =  {
+  __VOLK_ATTR_ALIGNED(16) short cntl3[vlen] =  {
     0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff };
-  short scalars[4] __attribute__ ((aligned (16))) = {1, 2, 3, 4};
+  __VOLK_ATTR_ALIGNED(16) short scalars[4] = {1, 2, 3, 4};
   
   
 
-- 
cgit