* Remove unintended commits.

From-SVN: r142475

4 files changed, 7 insertions, 29 deletions

diff --git a/gcc/config/i386/avxintrin.h b/gcc/config/i386/avxintrin.h
index 6d33308..7aea85d 100644
--- a/gcc/config/i386/avxintrin.h
+++ b/gcc/config/i386/avxintrin.h
@@ -27,18 +27,9 @@
 /* Implemented from the specification included in the Intel C++ Compiler
    User Guide and Reference, version 11.0.  */
 
-#ifndef _AVXINTRIN_H_INCLUDED
-#define _AVXINTRIN_H_INCLUDED
-
-#if !defined (__AVX__)
-# error "AVX instruction set not enabled"
-#else
-
-/* We need definitions from the SSE4.1, SSSE3, SSE3, SSE2 and SSE
-   header files.  */
-#include <smmintrin.h>
-
-/* AVX */
+#ifndef _IMMINTRIN_H_INCLUDED
+# error "Never use <avxintrin.h> directly; include <immintrin.h> instead."
+#endif
 
 /* Internal data types for implementing the intrinsics.  */
 typedef double __v4df __attribute__ ((__vector_size__ (32)));
@@ -1478,7 +1469,3 @@ _mm256_castsi128_si256 (__m128i __A)
 {
   return (__m256i) __builtin_ia32_si256_si ((__v4si)__A);
 }
-
-#endif /* __AVX__ */
-
-#endif /* _AVXINTRIN_H_INCLUDED */
diff --git a/gcc/testsuite/gcc.target/i386/avx-1.c b/gcc/testsuite/gcc.target/i386/avx-1.c
index f77aec7..d093d6c 100644
--- a/gcc/testsuite/gcc.target/i386/avx-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx-1.c
@@ -18,7 +18,7 @@
 #define __builtin_ia32_extrqi(X, I, L)  __builtin_ia32_extrqi(X, 1, 1)
 #define __builtin_ia32_insertqi(X, Y, I, L) __builtin_ia32_insertqi(X, Y, 1, 1)
 
-/* avxintrin.h */
+/* immintrin.h */
 #define __builtin_ia32_blendpd256(X, Y, M) __builtin_ia32_blendpd256(X, Y, 1)
 #define __builtin_ia32_blendps256(X, Y, M) __builtin_ia32_blendps256(X, Y, 1)
 #define __builtin_ia32_dpps256(X, Y, M) __builtin_ia32_dpps256(X, Y, 1)
@@ -133,7 +133,7 @@
 #define __builtin_ia32_protdi(A, B) __builtin_ia32_protdi(A,1)
 #define __builtin_ia32_protqi(A, B) __builtin_ia32_protqi(A,1)
 
-#include <avxintrin.h>
 #include <wmmintrin.h>
 #include <bmmintrin.h>
+#include <immintrin.h>
 #include <mm3dnow.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx-2.c b/gcc/testsuite/gcc.target/i386/avx-2.c
index 501e81e..62f6538 100644
--- a/gcc/testsuite/gcc.target/i386/avx-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-2.c
@@ -12,9 +12,9 @@
 #define extern
 #define __inline
 
-#include <avxintrin.h>
 #include <wmmintrin.h>
 #include <bmmintrin.h>
+#include <immintrin.h>
 #include <mm3dnow.h>
 
 #define _CONCAT(x,y) x ## y
@@ -53,7 +53,7 @@
 test_1x (_mm_extracti_si64, __m128i, __m128i, 1, 1)
 test_2x (_mm_inserti_si64, __m128i, __m128i, __m128i, 1, 1)
 
-/* avxintrin.h */
+/* immintrin.h */
 test_2 (_mm256_blend_pd, __m256d, __m256d, __m256d, 1)
 test_2 (_mm256_blend_ps, __m256, __m256, __m256, 1)
 test_2 (_mm256_dp_ps, __m256, __m256, __m256, 1)
diff --git a/gcc/testsuite/gcc.target/i386/intrinsics.h b/gcc/testsuite/gcc.target/i386/intrinsics.h
deleted file mode 100644
index 0701fa3..0000000
--- a/gcc/testsuite/gcc.target/i386/intrinsics.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Check that all x86 intrinsics can be included together.  */
-/* { dg-do compile } */
-/* { dg-options "-O -pedantic-errors -march=k8 -m3dnow -mavx -msse5 -maes -mpclmul" } */
-
-#include <immintrin.h>
-#include <bmmintrin.h>
-#include <mm3dnow.h>
-
-int dummy;