From 5a6e3d7925e9587b98902c26f3e4992419a140a2 Mon Sep 17 00:00:00 2001
From: Sebastian Peryt <sebastian.peryt@intel.com>
Date: Mon, 4 Jun 2018 13:08:40 +0200
Subject: [PATCH] cldemoteintrin.h: Change define from _X86INTRIN_H_INCLUDED to
 _IMMINTRIN_H_INCLUDED.

2018-06-04  Sebastian Peryt  <sebastian.peryt@intel.com>

        * config/i386/cldemoteintrin.h: Change define from _X86INTRIN_H_INCLUDED
        to _IMMINTRIN_H_INCLUDED.
        * config/i386/pconfigintrin.h: Ditto.
        * config/i386/waitpkgintrin.h: Ditto.
        * config/i386/immintrin.h: Add includes for sgxintrin.h,
        pconfigintrin.h, waitpkgintrin.h and cldemoteintrin.h.
        * config/i386/x86intrin.h: Remove includes for mintrin.h, xmmintrin.h,
        emmintrin.h, pmmintrin.h, tmmintrin.h, smmintrin.h, wmmintrin.h,
        bmiintrin.h, bmi2intrin.h, lzcntintrin.h, sgxintrin.h, pconfigintrin.h,
        waitpkgintrin.h and cldemoteintrin.h.

From-SVN: r261144
---
 gcc/ChangeLog                    | 13 +++++++++++++
 gcc/config/i386/cldemoteintrin.h |  4 ++--
 gcc/config/i386/immintrin.h      |  8 ++++++++
 gcc/config/i386/pconfigintrin.h  |  4 ++--
 gcc/config/i386/waitpkgintrin.h  |  4 ++--
 gcc/config/i386/x86intrin.h      | 30 ------------------------------
 6 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fde65eb..03fe3e0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2018-06-04  Sebastian Peryt  <sebastian.peryt@intel.com>
+
+        * config/i386/cldemoteintrin.h: Change define from _X86INTRIN_H_INCLUDED
+        to _IMMINTRIN_H_INCLUDED.
+        * config/i386/pconfigintrin.h: Ditto.
+        * config/i386/waitpkgintrin.h: Ditto.
+        * config/i386/immintrin.h: Add includes for sgxintrin.h,
+        pconfigintrin.h, waitpkgintrin.h and cldemoteintrin.h.
+        * config/i386/x86intrin.h: Remove includes for mintrin.h, xmmintrin.h,
+        emmintrin.h, pmmintrin.h, tmmintrin.h, smmintrin.h, wmmintrin.h,
+        bmiintrin.h, bmi2intrin.h, lzcntintrin.h, sgxintrin.h, pconfigintrin.h,
+        waitpkgintrin.h and cldemoteintrin.h.
+
 2018-06-04  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/86038
diff --git a/gcc/config/i386/cldemoteintrin.h b/gcc/config/i386/cldemoteintrin.h
index 1fa4c2d..a961a1c 100644
--- a/gcc/config/i386/cldemoteintrin.h
+++ b/gcc/config/i386/cldemoteintrin.h
@@ -21,8 +21,8 @@
    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-#if !defined _X86INTRIN_H_INCLUDED
-# error "Never use <cldemoteintrin.h> directly; include <x86intrin.h> instead."
+#if !defined _IMMINTRIN_H_INCLUDED
+# error "Never use <cldemoteintrin.h> directly; include <immintrin.h> instead."
 #endif
 
 #ifndef _CLDEMOTE_H_INCLUDED
diff --git a/gcc/config/i386/immintrin.h b/gcc/config/i386/immintrin.h
index 63c5e59..344e92c 100644
--- a/gcc/config/i386/immintrin.h
+++ b/gcc/config/i386/immintrin.h
@@ -112,6 +112,14 @@
 
 #include <movdirintrin.h>
 
+#include <sgxintrin.h>
+
+#include <pconfigintrin.h>
+
+#include <waitpkgintrin.h>
+
+#include <cldemoteintrin.h>
+
 extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _wbinvd (void)
diff --git a/gcc/config/i386/pconfigintrin.h b/gcc/config/i386/pconfigintrin.h
index 1c9c35c..d2a3261 100644
--- a/gcc/config/i386/pconfigintrin.h
+++ b/gcc/config/i386/pconfigintrin.h
@@ -1,5 +1,5 @@
-#ifndef _X86INTRIN_H_INCLUDED
-#error "Never use <pconfigintrin.h> directly; include <x86intrin.h> instead."
+#ifndef _IMMINTRIN_H_INCLUDED
+#error "Never use <pconfigintrin.h> directly; include <immintrin.h> instead."
 #endif
 
 #ifndef _PCONFIGINTRIN_H_INCLUDED
diff --git a/gcc/config/i386/waitpkgintrin.h b/gcc/config/i386/waitpkgintrin.h
index 8b68091..4418dcd 100644
--- a/gcc/config/i386/waitpkgintrin.h
+++ b/gcc/config/i386/waitpkgintrin.h
@@ -21,8 +21,8 @@
    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-#if !defined _X86INTRIN_H_INCLUDED
-# error "Never use <waitpkgintrin.h> directly; include <x86intrin.h> instead."
+#if !defined _IMMINTRIN_H_INCLUDED
+# error "Never use <waitpkgintrin.h> directly; include <immintrin.h> instead."
 #endif
 
 #ifndef _WAITPKG_H_INCLUDED
diff --git a/gcc/config/i386/x86intrin.h b/gcc/config/i386/x86intrin.h
index 6d67e9c..92bdf65 100644
--- a/gcc/config/i386/x86intrin.h
+++ b/gcc/config/i386/x86intrin.h
@@ -28,22 +28,6 @@
 
 #ifndef __iamcu__
 
-#include <mmintrin.h>
-
-#include <xmmintrin.h>
-
-#include <emmintrin.h>
-
-#include <pmmintrin.h>
-
-#include <tmmintrin.h>
-
-#include <ammintrin.h>
-
-#include <smmintrin.h>
-
-#include <wmmintrin.h>
-
 /* For including AVX instructions */
 #include <immintrin.h>
 
@@ -55,14 +39,8 @@
 
 #include <lwpintrin.h>
 
-#include <bmiintrin.h>
-
-#include <bmi2intrin.h>
-
 #include <tbmintrin.h>
 
-#include <lzcntintrin.h>
-
 #include <popcntintrin.h>
 
 #include <rdseedintrin.h>
@@ -75,10 +53,6 @@
 
 #include <xsaveoptintrin.h>
 
-#include <sgxintrin.h>
-
-#include <pconfigintrin.h>
-
 #endif /* __iamcu__ */
 
 #include <adxintrin.h>
@@ -101,10 +75,6 @@
 
 #include <pkuintrin.h>
 
-#include <waitpkgintrin.h>
-
-#include <cldemoteintrin.h>
-
 #endif /* __iamcu__ */
 
 #endif /* _X86INTRIN_H_INCLUDED */
-- 
2.7.4