gcc8 _xgetbv fix

3 files changed, 55 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c9a1d1b0221..45418bf6ae05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Tue May  8 09:42:37 UTC 2018
 pkgbase = mingw-w64-headers
 	pkgdesc = MinGW-w64 headers for Windows
 	pkgver = 5.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://mingw-w64.sourceforge.net
 	arch = any
 	groups = mingw-w64-toolchain
@@ -12,9 +14,10 @@ pkgbase = mingw-w64-headers
 	options = !emptydirs
 	source = https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v5.0.3.tar.bz2
 	source = https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v5.0.3.tar.bz2.sig
-	validpgpkeys = CAF5641F74F7DFBA88AE205693BDB53CD4EBC740
+	source = 0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch
 	sha256sums = 2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4
 	sha256sums = SKIP
+	sha256sums = be8aabf9c98026db998c97e7e14293d4a9db9a73587ab860e72d7a798b6ad16e
 
 pkgname = mingw-w64-headers
 
diff --git a/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch b/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch
new file mode 100644
index 000000000000..3d39f08f8ee7
--- /dev/null
+++ b/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch
@@ -0,0 +1,36 @@
+From 5aa15ee4a5f04cdc797deb685d23dc67275af357 Mon Sep 17 00:00:00 2001
+From: Mateusz <mateuszb@poczta.onet.pl>
+Date: Mon, 22 Jan 2018 20:58:48 +0100
+Subject: [PATCH] intrin-impl.h: do not define _xgetbv for GCC 8
+
+GCC 8 from r248028 has defined function _xgetbv and we should
+avoid double definition of this function.
+
+Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
+---
+ mingw-w64-headers/include/psdk_inc/intrin-impl.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mingw-w64-headers/include/psdk_inc/intrin-impl.h b/mingw-w64-headers/include/psdk_inc/intrin-impl.h
+index ff9e6aff..88af804c 100644
+--- a/mingw-w64-headers/include/psdk_inc/intrin-impl.h
++++ b/mingw-w64-headers/include/psdk_inc/intrin-impl.h
+@@ -1775,6 +1775,7 @@ __buildmov(__movsd, unsigned __LONG32, "d")
+ #define __INTRINSIC_DEFINED___movsd
+ #endif /* __INTRINSIC_PROLOG */
+ 
++#if !defined(__GNUC__) || __GNUC__ < 8 /* GCC 8 has already defined _xgetbv */
+ /* NOTE: This should be in immintrin.h */
+ #if __INTRINSIC_PROLOG(_xgetbv)
+ unsigned __int64 _xgetbv(unsigned int);
+@@ -1798,6 +1799,7 @@ unsigned __int64 _xgetbv(unsigned int index)
+ #endif
+ #define __INTRINSIC_DEFINED__xgetbv
+ #endif /* __INTRINSIC_PROLOG */
++#endif /* __GNUC__ < 8 */
+ 
+ #endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */
+ 
+-- 
+2.14.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 914349c6a8f8..ad6059b2df12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 266002 2017-11-09 13:16:03Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
 
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname='mingw-w64-headers'
 pkgver=5.0.3
 _pkgver=${pkgver/rc/-rc}
-pkgrel=1
+pkgrel=2
 pkgdesc="MinGW-w64 headers for Windows"
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
@@ -15,9 +14,18 @@ license=('custom')
 groups=('mingw-w64-toolchain' 'mingw-w64')
 options=('!strip' '!libtool' '!emptydirs')
 validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740')
-source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig})
+source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig}
+        0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch)
 sha256sums=('2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4'
-            'SKIP')
+            'SKIP'
+            'be8aabf9c98026db998c97e7e14293d4a9db9a73587ab860e72d7a798b6ad16e')
+
+prepare() {
+  cd "$srcdir"/mingw-w64-v${_pkgver}
+
+  # https://sourceforge.net/p/mingw-w64/mailman/message/36200602/
+  patch -p1 -i "$srcdir"/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch
+}
 
 build() {
   for _target in ${_targets}; do