[arch-commits] Commit in mingw-w64-gcc/trunk (4 files)

Sergej Pupykin spupykin at archlinux.org
Wed May 4 13:30:06 UTC 2016


    Date: Wednesday, May 4, 2016 @ 15:30:04
  Author: spupykin
Revision: 173728

Modified:
  mingw-w64-gcc/trunk/PKGBUILD
Deleted:
  mingw-w64-gcc/trunk/gcc-make-xmmintrin-header-cplusplus-compatible.patch
  mingw-w64-gcc/trunk/isl.patch
  mingw-w64-gcc/trunk/libgomp.patch

------------------------------------------------------+
 PKGBUILD                                             |   25 +----
 gcc-make-xmmintrin-header-cplusplus-compatible.patch |   24 -----
 isl.patch                                            |   76 -----------------
 libgomp.patch                                        |   41 ---------
 4 files changed, 6 insertions(+), 160 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-04 13:20:45 UTC (rev 173727)
+++ PKGBUILD	2016-05-04 13:30:04 UTC (rev 173728)
@@ -5,7 +5,7 @@
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-gcc
-pkgver=5.3.0
+pkgver=6.1.1
 _islver=0.12.2
 _cloogver=0.18.1
 pkgrel=1
@@ -26,34 +26,21 @@
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
 source=("ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2"
 	"http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2"
-	"http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz"
-	'gcc-make-xmmintrin-header-cplusplus-compatible.patch'
-	'libgomp.patch')
-md5sums=('c9616fd448f980259c31de613e575719'
+	"http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz")
+md5sums=('8fb6cb98b8459f5863328380fbf06bd1'
          'e039bfcfb6c2ab039b8ee69bf883e824'
-         'e34fca0540d840e5d0f6427e98c92252'
-         'da6c9ba6baebe1286f3219d4181cdbb8'
-         '83a29951782870ac94f497815cbfd73e')
+         'e34fca0540d840e5d0f6427e98c92252')
 
 prepare() {
   cd ${srcdir}/gcc-${pkgver}
-
   # link isl/cloog for in-tree builds
   ln -s ../isl-${_islver} isl
   ln -s ../cloog-${_cloogver} cloog
 
   #do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+#  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
-
-  # 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-w64-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/include/intrin.h:561:28: error: conflicts with new declaration with 'C' linkage
-#  patch -p0 -i ${srcdir}/gcc-make-xmmintrin-header-cplusplus-compatible.patch
-#  patch -p0 -i ${srcdir}/libgomp.patch
+#  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 }
 
 build() {

Deleted: gcc-make-xmmintrin-header-cplusplus-compatible.patch
===================================================================
--- gcc-make-xmmintrin-header-cplusplus-compatible.patch	2016-05-04 13:20:45 UTC (rev 173727)
+++ gcc-make-xmmintrin-header-cplusplus-compatible.patch	2016-05-04 13:30:04 UTC (rev 173728)
@@ -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>

Deleted: isl.patch
===================================================================
--- isl.patch	2016-05-04 13:20:45 UTC (rev 173727)
+++ isl.patch	2016-05-04 13:30:04 UTC (rev 173728)
@@ -1,76 +0,0 @@
-diff -wbBur gcc-4.9.0/gcc/graphite-clast-to-gimple.c gcc-4.9.0.my/gcc/graphite-clast-to-gimple.c
---- gcc-4.9.0/gcc/graphite-clast-to-gimple.c	2014-03-03 15:39:22.000000000 +0400
-+++ gcc-4.9.0.my/gcc/graphite-clast-to-gimple.c	2014-06-09 15:23:14.858543000 +0400
-@@ -28,6 +28,8 @@
- #include <isl/constraint.h>
- #include <isl/ilp.h>
- #include <isl/aff.h>
-+#include <isl/deprecated/int.h>
-+#include <isl/deprecated/ilp_int.h>
- #include <cloog/cloog.h>
- #include <cloog/isl/domain.h>
- #endif
-diff -wbBur gcc-4.9.0/gcc/graphite-interchange.c gcc-4.9.0.my/gcc/graphite-interchange.c
---- gcc-4.9.0/gcc/graphite-interchange.c	2014-01-03 02:23:26.000000000 +0400
-+++ gcc-4.9.0.my/gcc/graphite-interchange.c	2014-06-09 15:24:02.275209122 +0400
-@@ -29,6 +29,9 @@
- #include <isl/map.h>
- #include <isl/union_map.h>
- #include <isl/ilp.h>
-+#include <isl/deprecated/int.h>
-+#include <isl/deprecated/ilp_int.h>
-+#include <isl/deprecated/constraint_int.h>
- #include <cloog/cloog.h>
- #include <cloog/isl/domain.h>
- #endif
-diff -wbBur gcc-4.9.0/gcc/graphite-optimize-isl.c gcc-4.9.0.my/gcc/graphite-optimize-isl.c
---- gcc-4.9.0/gcc/graphite-optimize-isl.c	2014-01-03 02:23:26.000000000 +0400
-+++ gcc-4.9.0.my/gcc/graphite-optimize-isl.c	2014-06-09 15:28:20.325206155 +0400
-@@ -28,6 +28,10 @@
- #include <isl/band.h>
- #include <isl/aff.h>
- #include <isl/options.h>
-+#include <isl/deprecated/int.h>
-+#include <isl/deprecated/ilp_int.h>
-+#include <isl/deprecated/aff_int.h>
-+#include <isl/deprecated/constraint_int.h>
- #endif
- 
- #include "system.h"
-@@ -373,7 +377,7 @@
- 	{
- 	  for (i = ScheduleDimensions - 1 ;  i >= 0 ; i--)
- 	    {
--	      if (isl_band_member_is_zero_distance (Band, i))
-+	      if (isl_band_member_is_coincident (Band, i))
- 		{
- 		  isl_map *TileMap;
- 		  isl_union_map *TileUMap;
-diff -wbBur gcc-4.9.0/gcc/graphite-poly.c gcc-4.9.0.my/gcc/graphite-poly.c
---- gcc-4.9.0/gcc/graphite-poly.c	2014-01-03 02:23:26.000000000 +0400
-+++ gcc-4.9.0.my/gcc/graphite-poly.c	2014-06-09 15:31:04.541870933 +0400
-@@ -28,6 +28,10 @@
- #include <isl/constraint.h>
- #include <isl/ilp.h>
- #include <isl/aff.h>
-+#include <isl/deprecated/int.h>
-+#include <isl/deprecated/ilp_int.h>
-+#include <isl/deprecated/aff_int.h>
-+#include <isl/deprecated/constraint_int.h>
- #include <cloog/cloog.h>
- #include <cloog/isl/domain.h>
- #endif
-diff -wbBur gcc-4.9.0/gcc/graphite-sese-to-poly.c gcc-4.9.0.my/gcc/graphite-sese-to-poly.c
---- gcc-4.9.0/gcc/graphite-sese-to-poly.c	2014-04-08 14:59:40.000000000 +0400
-+++ gcc-4.9.0.my/gcc/graphite-sese-to-poly.c	2014-06-09 15:31:21.731870661 +0400
-@@ -26,6 +26,10 @@
- #include <isl/union_map.h>
- #include <isl/constraint.h>
- #include <isl/aff.h>
-+#include <isl/deprecated/int.h>
-+#include <isl/deprecated/ilp_int.h>
-+#include <isl/deprecated/aff_int.h>
-+#include <isl/deprecated/constraint_int.h>
- #include <cloog/cloog.h>
- #include <cloog/cloog.h>
- #include <cloog/isl/domain.h>

Deleted: libgomp.patch
===================================================================
--- libgomp.patch	2016-05-04 13:20:45 UTC (rev 173727)
+++ libgomp.patch	2016-05-04 13:30:04 UTC (rev 173728)
@@ -1,41 +0,0 @@
-Index: libgomp/oacc-int.h
-===================================================================
---- libgomp/oacc-int.h	(revision 228010)
-+++ libgomp/oacc-int.h	(revision 228011)
-@@ -97,6 +97,7 @@
- void goacc_save_and_set_bind (acc_device_t);
- void goacc_restore_bind (void);
- void goacc_lazy_initialize (void);
-+void goacc_host_init (void);
- 
- #ifdef HAVE_ATTRIBUTE_VISIBILITY
- # pragma GCC visibility pop
-Index: libgomp/oacc-init.c
-===================================================================
---- libgomp/oacc-init.c	(revision 228010)
-+++ libgomp/oacc-init.c	(revision 228011)
-@@ -580,6 +580,9 @@
- 
-   goacc_threads = NULL;
-   gomp_mutex_init (&goacc_thread_lock);
-+
-+  /* Initialize and register the 'host' device type.  */
-+  goacc_host_init ();
- }
- 
- /* Compiler helper functions */
-Index: libgomp/oacc-host.c
-===================================================================
---- libgomp/oacc-host.c	(revision 228010)
-+++ libgomp/oacc-host.c	(revision 228011)
-@@ -82,8 +82,8 @@
-   };
- 
- /* Register this device type.  */
--static __attribute__ ((constructor))
--void goacc_host_init (void)
-+void
-+goacc_host_init (void)
- {
-   gomp_mutex_init (&host_dispatch.lock);
-   goacc_register (&host_dispatch);



More information about the arch-commits mailing list