From 31c2bc2e0dbf30472c2b6501fd085bfc50ccb8ad Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 19 Aug 2016 17:24:22 +0200
Subject: [PATCH] fxsrintrin.h (_fxsave): Remove return keyword in inlines
 returning void.

	* config/i386/fxsrintrin.h (_fxsave): Remove return keyword in inlines
	returning void.
	(_fxrstor, _fxsave64, _fxrstor64): Likewise.
	* config/i386/xsaveintrin.h (_xsave, _xrstor, _xsave64, _xrstor64):
	Likewise.
	* config/i386/xsaveoptintrin.h (_xsaveopt, _xsaveopt64): Likewise.
	* config/i386/pkuintrin.h (_wrpkru): Likewise.  Add space after
	function name.
	(_rdpkru_u32): Add space after function name.

From-SVN: r239616
---
 gcc/ChangeLog                    | 10 ++++++++++
 gcc/config/i386/fxsrintrin.h     |  8 ++++----
 gcc/config/i386/pkuintrin.h      |  6 +++---
 gcc/config/i386/xsaveintrin.h    |  8 ++++----
 gcc/config/i386/xsaveoptintrin.h |  4 ++--
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a3bd72745a..6ddf276f8b4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
 2016-08-19  Jakub Jelinek  <jakub@redhat.com>
 
+	* config/i386/fxsrintrin.h (_fxsave): Remove return keyword in inlines
+	returning void.
+	(_fxrstor, _fxsave64, _fxrstor64): Likewise.
+	* config/i386/xsaveintrin.h (_xsave, _xrstor, _xsave64, _xrstor64):
+	Likewise.
+	* config/i386/xsaveoptintrin.h (_xsaveopt, _xsaveopt64): Likewise.
+	* config/i386/pkuintrin.h (_wrpkru): Likewise.  Add space after
+	function name.
+	(_rdpkru_u32): Add space after function name.
+
 	* config/i386/t-i386 (i386-c.o): Don't depend on
 	i386-builtin-types.inc.
 	(i386.o): Depend on i386-builtin-types.inc.
diff --git a/gcc/config/i386/fxsrintrin.h b/gcc/config/i386/fxsrintrin.h
index b18b898c26a..b457e97fad5 100644
--- a/gcc/config/i386/fxsrintrin.h
+++ b/gcc/config/i386/fxsrintrin.h
@@ -38,14 +38,14 @@ extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _fxsave (void *__P)
 {
-  return __builtin_ia32_fxsave (__P);
+  __builtin_ia32_fxsave (__P);
 }
 
 extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _fxrstor (void *__P)
 {
-  return __builtin_ia32_fxrstor (__P);
+  __builtin_ia32_fxrstor (__P);
 }
 
 #ifdef __x86_64__
@@ -53,14 +53,14 @@ extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _fxsave64 (void *__P)
 {
-    return __builtin_ia32_fxsave64 (__P);
+  __builtin_ia32_fxsave64 (__P);
 }
 
 extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _fxrstor64 (void *__P)
 {
-    return __builtin_ia32_fxrstor64 (__P);
+  __builtin_ia32_fxrstor64 (__P);
 }
 #endif
 
diff --git a/gcc/config/i386/pkuintrin.h b/gcc/config/i386/pkuintrin.h
index 09fdcd1d3f3..e9cfb4eeaa1 100644
--- a/gcc/config/i386/pkuintrin.h
+++ b/gcc/config/i386/pkuintrin.h
@@ -36,16 +36,16 @@
 
 extern __inline unsigned int
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
-_rdpkru_u32(void)
+_rdpkru_u32 (void)
 {
   return __builtin_ia32_rdpkru ();
 }
 
 extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
-_wrpkru(unsigned int key)
+_wrpkru (unsigned int key)
 {
-  return __builtin_ia32_wrpkru (key);
+  __builtin_ia32_wrpkru (key);
 }
 
 #ifdef __DISABLE_PKU__
diff --git a/gcc/config/i386/xsaveintrin.h b/gcc/config/i386/xsaveintrin.h
index 53616b72281..523a8c4089e 100644
--- a/gcc/config/i386/xsaveintrin.h
+++ b/gcc/config/i386/xsaveintrin.h
@@ -38,14 +38,14 @@ extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _xsave (void *__P, long long __M)
 {
-  return __builtin_ia32_xsave (__P, __M);
+  __builtin_ia32_xsave (__P, __M);
 }
 
 extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _xrstor (void *__P, long long __M)
 {
-  return __builtin_ia32_xrstor (__P, __M);
+  __builtin_ia32_xrstor (__P, __M);
 }
 
 #ifdef __x86_64__
@@ -53,14 +53,14 @@ extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _xsave64 (void *__P, long long __M)
 {
-  return __builtin_ia32_xsave64 (__P, __M);
+  __builtin_ia32_xsave64 (__P, __M);
 }
 
 extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _xrstor64 (void *__P, long long __M)
 {
-  return __builtin_ia32_xrstor64 (__P, __M);
+  __builtin_ia32_xrstor64 (__P, __M);
 }
 #endif
 
diff --git a/gcc/config/i386/xsaveoptintrin.h b/gcc/config/i386/xsaveoptintrin.h
index 2569824bb81..25bb2385560 100644
--- a/gcc/config/i386/xsaveoptintrin.h
+++ b/gcc/config/i386/xsaveoptintrin.h
@@ -38,7 +38,7 @@ extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _xsaveopt (void *__P, long long __M)
 {
-  return __builtin_ia32_xsaveopt (__P, __M);
+  __builtin_ia32_xsaveopt (__P, __M);
 }
 
 #ifdef __x86_64__
@@ -46,7 +46,7 @@ extern __inline void
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _xsaveopt64 (void *__P, long long __M)
 {
-  return __builtin_ia32_xsaveopt64 (__P, __M);
+  __builtin_ia32_xsaveopt64 (__P, __M);
 }
 #endif
 
-- 
2.30.2