Revert "Fix build warning"

This reverts commit 252a9c156306e8802d90937614af517501ddee48.

Change-Id: I0e7ad15408b9e2ebce1f0fb0f4f1813fd5cb85c3

diff --git a/pixman/pixman-glyph.c b/pixman/pixman-glyph.c
index 470b5ef42ec427c177f38c0f41e8daad646c87cc..96a349ab472720b4eb27299ba143c8fa9162def0 100644 (file)
--- a/pixman/pixman-glyph.c
+++ b/pixman/pixman-glyph.c
@@ -43,14 +43,6 @@ typedef struct glyph_t glyph_t;
 #define HASH_SIZE (2 * N_GLYPHS_HIGH_WATER)
 #define HASH_MASK (HASH_SIZE - 1)
 
-#if defined(__has_attribute)
-#define HAS_FORCE_ALIGN_ARG_POINTER __has_attribute(__force_align_arg_pointer__)
-#elif defined(_GNUC_) && define(__i386__)
-#define HAS_FORCE_ALIGN_ARG_POINTER 1
-#else
-#define HAS_FORCE_ALIGN_ARG_POINTER 0
-#endif
-
 struct glyph_t
 {
     void *             font_key;
@@ -399,7 +391,7 @@ box32_intersect (pixman_box32_t *dest,
     return dest->x2 > dest->x1 && dest->y2 > dest->y1;
 }
 
-#if HAS_FORCE_ALIGN_ARG_POINTER
+#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
 __attribute__((__force_align_arg_pointer__))
 #endif
 PIXMAN_EXPORT void
@@ -641,7 +633,7 @@ out:
  *   - Trim the mask to the destination clip/image?
  *   - Trim composite region based on sources, when the op ignores 0s.
  */
-#if HAS_FORCE_ALIGN_ARG_POINTER
+#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
 __attribute__((__force_align_arg_pointer__))
 #endif
 PIXMAN_EXPORT void