diff --git a/.gitignore b/.gitignore index daf226e..9ba6b2d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ gcc-4.5.1.tar.bz2 /gcc-4.9.2.tar.bz2 /gcc-5-20150301.tar.bz2 /gcc-5-20150322.tar.bz2 +/gcc-5-20150405.tar.bz2 diff --git a/gcc-5-workaround-libgomp-bug-64972.patch b/gcc-5-workaround-libgomp-bug-64972.patch deleted file mode 100644 index 773e10d..0000000 --- a/gcc-5-workaround-libgomp-bug-64972.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- gcc-5-20150301/libgomp/oacc-parallel.c.orig 2015-03-07 16:50:20.069608638 +0100 -+++ gcc-5-20150301/libgomp/oacc-parallel.c 2015-03-07 17:03:12.234344244 +0100 -@@ -99,8 +99,10 @@ - gomp_fatal ("num_workers (%d) different from one is not yet supported", - num_workers); - -+#if 0 - gomp_debug (0, "%s: mapnum=%zd, hostaddrs=%p, sizes=%p, kinds=%p, async=%d\n", - __FUNCTION__, mapnum, hostaddrs, sizes, kinds, async); -+#endif - - select_acc_device (device); - -@@ -178,8 +180,10 @@ - bool host_fallback = device == GOMP_DEVICE_HOST_FALLBACK; - struct target_mem_desc *tgt; - -+#if 0 - gomp_debug (0, "%s: mapnum=%zd, hostaddrs=%p, sizes=%p, kinds=%p\n", - __FUNCTION__, mapnum, hostaddrs, sizes, kinds); -+#endif - - select_acc_device (device); - ---- gcc-5-20150301/libgomp/target.c.orig 2015-03-07 17:01:13.386384170 +0100 -+++ gcc-5-20150301/libgomp/target.c 2015-03-07 17:02:21.584508913 +0100 -@@ -437,10 +437,7 @@ - { - /* We already looked up the memory region above and it - was missing. */ -- size_t size = k->host_end - k->host_start; -- gomp_fatal ("present clause: !acc_is_present (%p, " -- "%zd (0x%zx))", (void *) k->host_start, -- size, size); -+ gomp_fatal ("present clause: !acc_is_present"); - } - break; - case GOMP_MAP_FORCE_DEVICEPTR: diff --git a/mingw-gcc.spec b/mingw-gcc.spec index 6998c2c..3fc0448 100644 --- a/mingw-gcc.spec +++ b/mingw-gcc.spec @@ -20,8 +20,8 @@ %global enable_tests 0 # If enabled, build from a snapshot -%global snapshot_date 20150322 -%global snapshot_rev 221575 +%global snapshot_date 20150405 +%global snapshot_rev 221873 # When building from a snapshot the name of the source folder is different %if 0%{?snapshot_date} @@ -32,7 +32,7 @@ Name: mingw-gcc Version: 5.0.0 -Release: 0.2%{?snapshot_date:.svn.%{snapshot_date}.r%{snapshot_rev}}%{?dist} +Release: 0.3%{?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,9 +44,6 @@ Source0: ftp://ftp.nluug.nl/mirror/languages/gcc/snapshots/5-%{snapshot_d Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2 %endif -# Workaround https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64972 -Patch0: gcc-5-workaround-libgomp-bug-64972.patch - BuildRequires: texinfo BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw64-filesystem >= 95 @@ -274,7 +271,6 @@ needed for OpenMP v3.0 support for the win32 target. %prep %setup -q -n %{source_folder} -%patch0 -p1 echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE @@ -731,6 +727,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-%{mingw64_target}-* %changelog +* Fri Apr 10 2015 Erik van Pienbroek - 5.0.0-0.3.svn.20150405.r221873 +- Update to gcc 5 20150405 snapshot (rev 221873) + * Mon Mar 23 2015 Erik van Pienbroek - 5.0.0-0.2.svn.20150322.r221575 - Update to gcc 5 20150322 snapshot (rev 221575) diff --git a/sources b/sources index f1db0a9..44b4e22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5503ae72eb8455c66f27361ff86f6e7b gcc-5-20150322.tar.bz2 +e244534e396ababde433b514dc5bb0c7 gcc-5-20150405.tar.bz2