Wrap force_align_arg_pointer in HAVE_I386

10 files changed, 20 insertions, 0 deletions

diff --git a/liboil/sse/clamp_sse.c b/liboil/sse/clamp_sse.c
index 06c8ae7..3ff8c10 100644
--- a/liboil/sse/clamp_sse.c
+++ b/liboil/sse/clamp_sse.c
@@ -32,8 +32,10 @@
 #include <emmintrin.h>
 #include <xmmintrin.h>
 
+#ifdef HAVE_I386
 /* TODO: If we have gcc 4.2 or above, do this. Otherwise, disable all SSE use */
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 SSE_FUNCTION static void
 clamp_u8_sse (uint8_t *dest, uint8_t *src1, int n, uint8_t *src2_1,
diff --git a/liboil/sse/composite_sse.c b/liboil/sse/composite_sse.c
index ce749cf..6045860 100644
--- a/liboil/sse/composite_sse.c
+++ b/liboil/sse/composite_sse.c
@@ -32,7 +32,9 @@
 #include <emmintrin.h>
 #include <liboil/liboilcolorspace.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 #define COMPOSITE_ADD(d,s) oil_clamp_255((d) + (s))
 
diff --git a/liboil/sse/composite_sse_2pix.c b/liboil/sse/composite_sse_2pix.c
index 2d19475..053f5a7 100644
--- a/liboil/sse/composite_sse_2pix.c
+++ b/liboil/sse/composite_sse_2pix.c
@@ -32,7 +32,9 @@
 #include <emmintrin.h>
 #include <liboil/liboilcolorspace.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 /* non-SSE2 compositing support */
 #define COMPOSITE_OVER(d,s,m) ((d) + (s) - oil_muldiv_255((d),(m)))
diff --git a/liboil/sse/composite_sse_4pix.c b/liboil/sse/composite_sse_4pix.c
index 12f4d2b..eec24ff 100644
--- a/liboil/sse/composite_sse_4pix.c
+++ b/liboil/sse/composite_sse_4pix.c
@@ -32,7 +32,9 @@
 #include <emmintrin.h>
 #include <liboil/liboilcolorspace.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 #ifdef ENABLE_BROKEN_IMPLS
 
diff --git a/liboil/sse/copy_sse.c b/liboil/sse/copy_sse.c
index 5509eae..84da4dc 100644
--- a/liboil/sse/copy_sse.c
+++ b/liboil/sse/copy_sse.c
@@ -31,7 +31,9 @@
 #include <liboil/liboilfunction.h>
 #include <emmintrin.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 SSE_FUNCTION static void
 copy_u8_sse (uint8_t *dest, const uint8_t *src, int n)
diff --git a/liboil/sse/math_sse.c b/liboil/sse/math_sse.c
index 0b70b42..16a90a3 100644
--- a/liboil/sse/math_sse.c
+++ b/liboil/sse/math_sse.c
@@ -32,7 +32,9 @@
 #include <emmintrin.h>
 #include <xmmintrin.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 SSE_FUNCTION static void
 add_f32_sse (float *dest, float *src1, float *src2, int n)
diff --git a/liboil/sse/math_sse_unroll2.c b/liboil/sse/math_sse_unroll2.c
index cd4f55f..fff3608 100644
--- a/liboil/sse/math_sse_unroll2.c
+++ b/liboil/sse/math_sse_unroll2.c
@@ -32,7 +32,9 @@
 #include <emmintrin.h>
 #include <xmmintrin.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 SSE_FUNCTION static void
 add_f32_sse_unroll2 (float *dest, float *src1, float *src2, int n)
diff --git a/liboil/sse/multsum_sse.c b/liboil/sse/multsum_sse.c
index 382dd60..d932dcc 100644
--- a/liboil/sse/multsum_sse.c
+++ b/liboil/sse/multsum_sse.c
@@ -5,7 +5,9 @@
 #include <liboil/liboilfunction.h>
 #include <emmintrin.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 #define MULTSUM_SSE2_NSTRIDED(i) { \
   t1 = _mm_load_pd(&OIL_GET(src1, i, double)); \
diff --git a/liboil/sse/sad8x8_sse.c b/liboil/sse/sad8x8_sse.c
index 3c7615c..215dbed 100644
--- a/liboil/sse/sad8x8_sse.c
+++ b/liboil/sse/sad8x8_sse.c
@@ -31,7 +31,9 @@
 #include <liboil/liboilfunction.h>
 #include <emmintrin.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 #ifdef ENABLE_BROKEN_IMPLS
 union m128_int {
diff --git a/liboil/sse/splat_sse.c b/liboil/sse/splat_sse.c
index a6c0be7..2430dc4 100644
--- a/liboil/sse/splat_sse.c
+++ b/liboil/sse/splat_sse.c
@@ -31,7 +31,9 @@
 #include <liboil/liboilfunction.h>
 #include <emmintrin.h>
 
+#ifdef HAVE_I386
 #define SSE_FUNCTION __attribute__((force_align_arg_pointer))
+#endif
 
 SSE_FUNCTION static void
 splat_u32_ns_sse (uint32_t *dest, const uint32_t *param, int n)