Dropped xmmintrin patch as the issue is resolved in mingw-w64 3.1.0

This commit is contained in:
Erik van Pienbroek 2014-01-11 20:16:44 +01:00
parent 9dd20b96e1
commit 94648aac85
2 changed files with 4 additions and 34 deletions

View File

@ -1,24 +0,0 @@
--- gcc/config/i386/xmmintrin.h.orig 2013-01-18 14:57:27.762645582 +0100
+++ gcc/config/i386/xmmintrin.h 2013-01-18 14:58:27.604561940 +0100
@@ -37,6 +37,10 @@
/* Get _mm_malloc () and _mm_free (). */
#include <mm_malloc.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* The Intel API is flexible enough that we must allow aliasing with other
vector types, and their scalar components. */
typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__));
@@ -1241,6 +1245,10 @@
(row3) = __builtin_ia32_movhlps (__t3, __t2); \
} while (0)
+#ifdef __cplusplus
+}
+#endif
+
/* For backward source compatibility. */
#ifdef __SSE2__
# include <emmintrin.h>

View File

@ -32,7 +32,7 @@
Name: mingw-gcc
Version: 4.8.2
Release: 1%{?snapshot_date:.svn.%{snapshot_date}.r%{snapshot_rev}}%{?dist}
Release: 2%{?snapshot_date:.svn.%{snapshot_date}.r%{snapshot_rev}}%{?dist}
Summary: MinGW Windows cross-compiler (GCC) for C
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@ -44,14 +44,6 @@ Source0: ftp://ftp.nluug.nl/mirror/languages/gcc/snapshots/4.8-%{snapshot
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
%endif
# The file xmmintrin.h doesn't contain an extern "C" part
# This conflicts with mingw-w64 intrin.h and results in build
# failure like this one in mingw-qt5-qtbase:
# /usr/lib/gcc/i686-w64-mingw32/4.8.0/include/xmmintrin.h:997:1: error: previous declaration of 'int _m_pextrw(__m64, int)' with 'C++' linkage
# /usr/i686-w64-mingw32/sys-root/mingw/include/intrin.h:561:28: error: conflicts with new declaration with 'C' linkage
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56038
Patch0: gcc-make-xmmintrin-header-cplusplus-compatible.patch
BuildRequires: texinfo
BuildRequires: mingw32-filesystem >= 95
@ -277,7 +269,6 @@ needed for OpenMP v3.0 support for the win32 target.
%prep
%setup -q -n %{source_folder}
echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE
%patch0 -p0
%build
@ -702,6 +693,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-%{mingw64_target}-*
%changelog
* Fri Jan 10 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 4.8.2-2
- Dropped xmmintrin patch as the issue is resolved in mingw-w64 3.1.0
* Sat Oct 19 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 4.8.2-1
- Update to 4.8.2
- Build with C++11 std::thread support (F21+ only)