[arch-commits] Commit in mingw-w64-headers/trunk (2 files)

[Sergej Pupykin]

    Date: Wednesday, June 4, 2014 @ 13:25:42
  Author: spupykin
Revision: 112594

upgpkg: mingw-w64-headers 3.1.0-2

upd

Added:
  mingw-w64-headers/trunk/30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch
Modified:
  mingw-w64-headers/trunk/PKGBUILD

------------------------------------------------+
 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch |   61 +++++++++++++++++++++++
 PKGBUILD                                       |   13 +++-
 2 files changed, 71 insertions(+), 3 deletions(-)

Added: 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch
===================================================================
--- 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch	                        (rev 0)
+++ 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch	2014-06-04 11:25:42 UTC (rev 112594)
@@ -0,0 +1,61 @@
+From 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c Mon Sep 17 00:00:00 2001
+From: cjacek <cjacek at 4407c894-4637-0410-b4f5-ada5f102cad1>
+Date: Thu, 13 Mar 2014 14:51:52 +0000
+Subject: [PATCH] intrin.h: Fixed mm3dnow.h conflict with recent GCC trunk.
+
+git-svn-id: https://svn.code.sf.net/p/mingw-w64/code@6525 4407c894-4637-0410-b4f5-ada5f102cad1
+---
+ trunk/mingw-w64-headers/crt/intrin.h | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/trunk/mingw-w64-headers/crt/intrin.h b/trunk/mingw-w64-headers/crt/intrin.h
+index 2348e09..593b5f2 100644
+--- a/trunk/mingw-w64-headers/crt/intrin.h
++++ b/trunk/mingw-w64-headers/crt/intrin.h
+@@ -105,6 +105,16 @@ extern "C" {
+ #endif
+ #endif
+ 
++#if defined(__3dNOW__) || defined(__MINGW_FORCE_SYS_INTRINS)
++#if defined(__cplusplus)
++extern "C" {
++#endif
++#include <mm3dnow.h>
++#if defined(__cplusplus)
++}
++#endif
++#endif
++
+ /* NOTE: it's not included by MS version, but we do it to try work around C++/C linkage differences */
+ #if defined(__SSE__) || defined(__MINGW_FORCE_SYS_INTRINS)
+ #if defined(__cplusplus)
+@@ -642,8 +652,6 @@ extern "C" {
+     __MACHINEX86X_NOX64(__m64 _m_pavgw(__m64,__m64))
+     __MACHINEX86X_NOX64(__m64 _m_psadbw(__m64,__m64))
+ #endif
+-    __MACHINEX86X_NOWIN64(__m64 _m_from_float(float))
+-    __MACHINEX86X_NOWIN64(float _m_to_float(__m64))
+ #if !defined(__GNUC__) || (!defined(__SSE__) && !defined(__MINGW_FORCE_SYS_INTRINS))
+     __MACHINEX86X_NOIA64(__m128 _mm_add_ss(__m128,__m128))
+     __MACHINEX86X_NOIA64(__m128 _mm_add_ps(__m128,__m128))
+@@ -745,6 +753,9 @@ extern "C" {
+     __MACHINEX86X_NOIA64(__m128 _mm_movelh_ps(__m128,__m128))
+     __MACHINEX86X_NOIA64(__m128 _mm_movehl_ps(__m128,__m128))
+ #endif
++#if !defined(__GNUC__) || (!defined(__3dNOW__) && !defined(__MINGW_FORCE_SYS_INTRINS))
++    __MACHINEX86X_NOWIN64(__m64 _m_from_float(float))
++    __MACHINEX86X_NOWIN64(float _m_to_float(__m64))
+     __MACHINEX86X_NOIA64(void _m_prefetch(void*))
+     __MACHINEX86X_NOIA64(void _m_prefetchw(void*_Source))
+     __MACHINEX86X_NOWIN64(void _m_femms(void))
+@@ -767,6 +778,7 @@ extern "C" {
+     __MACHINEX86X_NOWIN64(__m64 _m_pfsubr(__m64,__m64))
+     __MACHINEX86X_NOWIN64(__m64 _m_pi2fd(__m64))
+     __MACHINEX86X_NOWIN64(__m64 _m_pmulhrw(__m64,__m64))
++#endif
+     __MACHINEX86X_NOWIN64(__m64 _m_pf2iw(__m64))
+     __MACHINEX86X_NOWIN64(__m64 _m_pfnacc(__m64,__m64))
+     __MACHINEX86X_NOWIN64(__m64 _m_pfpnacc(__m64,__m64))
+-- 
+1.9.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-04 09:08:39 UTC (rev 112593)
+++ PKGBUILD	2014-06-04 11:25:42 UTC (rev 112594)
@@ -6,7 +6,7 @@
 
 pkgname='mingw-w64-headers'
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="MinGW-w64 headers for Windows"
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
@@ -13,9 +13,16 @@
 license=('custom')
 groups=('mingw-w64-toolchain' 'mingw-w64')
 options=('!strip' '!libtool' '!emptydirs')
-source=(http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2)
-md5sums=('df0e7657f46cbd59ed9cbe2a50c66e15')
+source=(http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2
+	30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch)
+md5sums=('df0e7657f46cbd59ed9cbe2a50c66e15'
+         'eab9c036e1396513ff5346e2079cab08')
 
+prepare() {
+    cd ${srcdir}/mingw-w64-v$pkgver/mingw-w64-headers
+    patch -p3 <$srcdir/30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch
+}
+
 build() {
   for _target in ${_targets}; do
     msg "Configuring ${_target} headers"