From fc5c0d58120116e4853824dd1dec0d007ede1738 Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 6 Nov 2009 10:33:33 +0000
Subject: [PATCH] 	* config/i386/x86intrin.h: Include fma4intrin.h,
 xopintrin.h and 	lwpintrin.h after immintrin.h. 	*
 config/i386/fma4intrin.h (__v8sf, __v4df, __m256, __m256d): Remove 
 typedefs.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@153965 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                |  5 +++++
 gcc/config/i386/fma4intrin.h |  9 ---------
 gcc/config/i386/x86intrin.h  | 22 +++++++++++-----------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70ed436e13a..6e1086aa30b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-06  Jakub Jelinek  <jakub@redhat.com>
 
+	* config/i386/x86intrin.h: Include fma4intrin.h, xopintrin.h and
+	lwpintrin.h after immintrin.h.
+	* config/i386/fma4intrin.h (__v8sf, __v4df, __m256, __m256d): Remove
+	typedefs.
+
 	PR middle-end/41935
 	* c-common.c (fold_offsetof_1) <case ARRAY_REF>: Don't crash for VLAs
 	or non-constant index, allow index one past the last element and
diff --git a/gcc/config/i386/fma4intrin.h b/gcc/config/i386/fma4intrin.h
index 42782ade0ed..2bd411a0f05 100644
--- a/gcc/config/i386/fma4intrin.h
+++ b/gcc/config/i386/fma4intrin.h
@@ -35,15 +35,6 @@
 /* We need definitions from the SSE4A, SSE3, SSE2 and SSE header files.  */
 #include <ammintrin.h>
 
-/* Internal data types for implementing the intrinsics.  */
-typedef float __v8sf __attribute__ ((__vector_size__ (32)));
-typedef double __v4df __attribute__ ((__vector_size__ (32)));
-
-typedef float __m256 __attribute__ ((__vector_size__ (32),
-				     __may_alias__));
-typedef double __m256d __attribute__ ((__vector_size__ (32),
-				       __may_alias__));
-
 /* 128b Floating point multiply/add type instructions.  */
 extern __inline __m128 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _mm_macc_ps (__m128 __A, __m128 __B, __m128 __C)
diff --git a/gcc/config/i386/x86intrin.h b/gcc/config/i386/x86intrin.h
index 465166aba6f..ac7e21fd6f7 100644
--- a/gcc/config/i386/x86intrin.h
+++ b/gcc/config/i386/x86intrin.h
@@ -54,6 +54,17 @@
 #include <smmintrin.h>
 #endif
 
+#if defined (__AES__) || defined (__PCLMUL__)
+#include <wmmintrin.h>
+#endif
+
+/* For including AVX instructions */
+#include <immintrin.h>
+
+#ifdef __3dNOW__
+#include <mm3dnow.h>
+#endif
+
 #ifdef __FMA4__
 #include <fma4intrin.h>
 #endif
@@ -66,15 +77,4 @@
 #include <lwpintrin.h>
 #endif
 
-#if defined (__AES__) || defined (__PCLMUL__)
-#include <wmmintrin.h>
-#endif
-
-/* For including AVX instructions */
-#include <immintrin.h>
-
-#ifdef __3dNOW__
-#include <mm3dnow.h>
-#endif
-
 #endif /* _X86INTRIN_H_INCLUDED */
-- 
2.11.0