[arch-commits] Commit in mingw-w64-gcc/trunk (PKGBUILD libgomp.patch)

[Sergej Pupykin]

    Date: Wednesday, October 28, 2015 @ 17:54:14
  Author: spupykin
Revision: 145202

Added:
  mingw-w64-gcc/trunk/libgomp.patch
Modified:
  mingw-w64-gcc/trunk/PKGBUILD

---------------+
 PKGBUILD      |    9 ++++++---
 libgomp.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-28 16:15:52 UTC (rev 145201)
+++ PKGBUILD	2015-10-28 16:54:14 UTC (rev 145202)
@@ -8,7 +8,7 @@
 pkgver=5.2.0
 _islver=0.12.2
 _cloogver=0.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
 arch=('i686' 'x86_64')
 url="http://gcc.gnu.org"
@@ -27,11 +27,13 @@
 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')
+	'gcc-make-xmmintrin-header-cplusplus-compatible.patch'
+	'libgomp.patch')
 md5sums=('a51bcfeb3da7dd4c623e27207ed43467'
          'e039bfcfb6c2ab039b8ee69bf883e824'
          'e34fca0540d840e5d0f6427e98c92252'
-         'da6c9ba6baebe1286f3219d4181cdbb8')
+         'da6c9ba6baebe1286f3219d4181cdbb8'
+         '83a29951782870ac94f497815cbfd73e')
 
 prepare() {
   cd ${srcdir}/gcc-${pkgver}
@@ -51,6 +53,7 @@
   # /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
 }
 
 build() {

Added: libgomp.patch
===================================================================
--- libgomp.patch	                        (rev 0)
+++ libgomp.patch	2015-10-28 16:54:14 UTC (rev 145202)
@@ -0,0 +1,41 @@
+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);