[arch-commits] Commit in mono/repos (13 files)

Bartłomiej Piotrowski bpiotrowski at nymeria.archlinux.org
Mon Mar 3 13:36:25 UTC 2014


    Date: Monday, March 3, 2014 @ 14:36:25
  Author: bpiotrowski
Revision: 206614

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  mono/repos/testing-i686/
  mono/repos/testing-i686/PKGBUILD
    (from rev 206613, mono/trunk/PKGBUILD)
  mono/repos/testing-i686/bug434892.patch
    (from rev 206613, mono/trunk/bug434892.patch)
  mono/repos/testing-i686/mono.binfmt.d
    (from rev 206613, mono/trunk/mono.binfmt.d)
  mono/repos/testing-i686/sgen_fix.patch
    (from rev 206613, mono/trunk/sgen_fix.patch)
  mono/repos/testing-x86_64/PKGBUILD
    (from rev 206613, mono/trunk/PKGBUILD)
  mono/repos/testing-x86_64/bug434892.patch
    (from rev 206613, mono/trunk/bug434892.patch)
  mono/repos/testing-x86_64/mono.binfmt.d
    (from rev 206613, mono/trunk/mono.binfmt.d)
  mono/repos/testing-x86_64/sgen_fix.patch
    (from rev 206613, mono/trunk/sgen_fix.patch)
Deleted:
  mono/repos/testing-x86_64/PKGBUILD
  mono/repos/testing-x86_64/bug434892.patch
  mono/repos/testing-x86_64/mono.binfmt.d
  mono/repos/testing-x86_64/sgen_fix.patch

--------------------------------+
 /PKGBUILD                      |   58 ++++++++++++++++++++
 /bug434892.patch               |   11 +++
 /mono.binfmt.d                 |    1 
 /sgen_fix.patch                |  112 +++++++++++++++++++++++++++++++++++++++
 testing-i686/PKGBUILD          |   58 ++++++++++++++++++++
 testing-i686/bug434892.patch   |   11 +++
 testing-i686/mono.binfmt.d     |    1 
 testing-i686/sgen_fix.patch    |  112 +++++++++++++++++++++++++++++++++++++++
 testing-x86_64/PKGBUILD        |   58 --------------------
 testing-x86_64/bug434892.patch |   11 ---
 testing-x86_64/mono.binfmt.d   |    1 
 testing-x86_64/sgen_fix.patch  |  112 ---------------------------------------
 12 files changed, 364 insertions(+), 182 deletions(-)

Copied: mono/repos/testing-i686/PKGBUILD (from rev 206613, mono/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-03-03 13:36:25 UTC (rev 206614)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: Brice Carpentier <brice at dlfp.org>
+
+pkgname=mono
+pkgver=3.2.8
+pkgrel=1
+pkgdesc="Free implementation of the .NET platform including runtime and compiler"
+arch=(i686 x86_64)
+license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
+url="http://www.mono-project.com/"
+depends=('zlib' 'libgdiplus>=2.10' 'sh' 'python')
+options=('!makeflags')
+provides=('monodoc')
+conflicts=('monodoc')
+source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
+        mono.binfmt.d
+        sgen_fix.patch)
+md5sums=('1075f99bd8a69890af9e30309728e684'
+         'b9ef8a65fea497acf176cca16c1e2402'
+         '8a700b94bff7a913f920e95890d2fb4c')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  # build mono
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --bindir=/usr/bin \
+    --sbindir=/usr/bin \
+    --disable-quiet-build \
+    --disable-system-aot \
+    --disable-static
+  make
+
+  # build jay
+  cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  # install jay
+  pushd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
+  make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install
+  popd
+
+  # install binfmt conf file and pathes
+  install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf
+
+  #install license
+  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 mcs/MIT.X11 "${pkgdir}"/usr/share/licenses/${pkgname}/
+
+  #fix .pc file to be able to request mono on what it depends, fixes #go-oo build
+  sed -i -e "s:#Requires:Requires:" "${pkgdir}"/usr/lib/pkgconfig/mono.pc
+}

Copied: mono/repos/testing-i686/bug434892.patch (from rev 206613, mono/trunk/bug434892.patch)
===================================================================
--- testing-i686/bug434892.patch	                        (rev 0)
+++ testing-i686/bug434892.patch	2014-03-03 13:36:25 UTC (rev 206614)
@@ -0,0 +1,11 @@
+--- trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/07/01 20:17:46	107006
++++ trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/10/28 09:32:46	117243
+@@ -177,7 +177,7 @@
+ 				foreach (OperationMessage om in op.Messages) {
+ 					Message msg = ctx.Services.GetMessage (om.Message);
+ 					foreach (MessagePart part in msg.Parts)
+-						parts.Add (part,part);
++						parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
+ 				}
+ 			}
+ 			

Copied: mono/repos/testing-i686/mono.binfmt.d (from rev 206613, mono/trunk/mono.binfmt.d)
===================================================================
--- testing-i686/mono.binfmt.d	                        (rev 0)
+++ testing-i686/mono.binfmt.d	2014-03-03 13:36:25 UTC (rev 206614)
@@ -0,0 +1 @@
+:CLR:M::MZ::/usr/bin/mono:

Copied: mono/repos/testing-i686/sgen_fix.patch (from rev 206613, mono/trunk/sgen_fix.patch)
===================================================================
--- testing-i686/sgen_fix.patch	                        (rev 0)
+++ testing-i686/sgen_fix.patch	2014-03-03 13:36:25 UTC (rev 206614)
@@ -0,0 +1,112 @@
+From d2cc22580898df5d4a15e0f99ab513e1570a6082 Mon Sep 17 00:00:00 2001
+From: Zoltan Varga <vargaz at gmail.com>
+Date: Fri, 20 Sep 2013 19:06:34 +0200
+Subject: [PATCH] [sgen] Use __builtin_ctzl () in OBJ_BITMAP_FOREACH_PTR () on
+ 64 bit platforms. Fixes #14834.
+
+---
+ mono/metadata/sgen-descriptor.h | 28 +++++++++++++++++++++++++---
+ mono/tests/sgen-descriptors.cs  | 15 +++++++++++++--
+ 2 files changed, 38 insertions(+), 5 deletions(-)
+
+diff --git a/mono/metadata/sgen-descriptor.h b/mono/metadata/sgen-descriptor.h
+index cd53a86..3a00589 100644
+--- a/mono/metadata/sgen-descriptor.h
++++ b/mono/metadata/sgen-descriptor.h
+@@ -170,21 +170,43 @@ enum {
+ 		}	\
+ 	} while (0)
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && SIZEOF_VOID_P==4
++#define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
++		/* there are pointers */        \
++		void **_objptr = (void**)(obj); \
++		gsize _bmap = (desc) >> 16;     \
++		_objptr += OBJECT_HEADER_WORDS; \
++		{ \
++			int _index = __builtin_ctz (_bmap);		\
++			_objptr += _index; \
++			_bmap >>= (_index + 1);				\
++			HANDLE_PTR (_objptr, (obj));		\
++			_objptr ++;							\
++			} \
++		while (_bmap) { \
++			int _index = __builtin_ctz (_bmap);		\
++			_objptr += _index; \
++			_bmap >>= (_index + 1);				\
++			HANDLE_PTR (_objptr, (obj));		\
++			_objptr ++;							\
++		}										\
++	} while (0)
++#elif defined(__GNUC__) && SIZEOF_VOID_P==8
++/* Same as above, but use _builtin_ctzl () */
+ #define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
+ 		/* there are pointers */        \
+ 		void **_objptr = (void**)(obj); \
+ 		gsize _bmap = (desc) >> 16;     \
+ 		_objptr += OBJECT_HEADER_WORDS; \
+ 		{ \
+-			int _index = __builtin_ctz (_bmap); \
++			int _index = __builtin_ctzl (_bmap);		\
+ 			_objptr += _index; \
+ 			_bmap >>= (_index + 1);				\
+ 			HANDLE_PTR (_objptr, (obj));		\
+ 			_objptr ++;							\
+ 			} \
+ 		while (_bmap) { \
+-			int _index = __builtin_ctz (_bmap); \
++			int _index = __builtin_ctzl (_bmap);		\
+ 			_objptr += _index; \
+ 			_bmap >>= (_index + 1);				\
+ 			HANDLE_PTR (_objptr, (obj));		\
+diff --git a/mono/tests/sgen-descriptors.cs b/mono/tests/sgen-descriptors.cs
+index ae00084..246e5aa 100644
+--- a/mono/tests/sgen-descriptors.cs
++++ b/mono/tests/sgen-descriptors.cs
+@@ -1,4 +1,5 @@
+ using System;
++using System.Runtime.InteropServices;
+ 
+ public struct SmallMixed
+ {
+@@ -47,6 +48,13 @@ public class HugePtrFree {
+ 	public LargeStruct2 c;
+ }
+ 
++[StructLayout (LayoutKind.Sequential)]
++public class Non32bitBitmap {
++	public object o;
++	public long i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15, i16, i17, i18, i19, i20, i21, i22, i23, i24, i25, i26, i27, i28, i29, i30, i31, i32, i33, i34, i35;
++	public object o2;
++}
++
+ /*
+ This is a stress test for descriptors.
+ */
+@@ -54,10 +62,10 @@ class Driver {
+ 	static char[] FOO = new char[] { 'f', 'o', 'b' };
+ 
+ 	static void Fill (int cycles) {
+-		object[] root = new object [12];
++		object[] root = new object [13];
+ 		object[] current = root;
+ 		for (int i = 0; i < cycles; ++i) {
+-			current [0] = new object [12];
++			current [0] = new object [13];
+ 			current [1] = new int [6];
+ 			current [2] = new int [2,3];
+ 			current [3] = new string (FOO);
+@@ -72,6 +80,9 @@ class Driver {
+ 				current [10] = new HugePtrFree ();
+ 			if ((i %  10000) == 0)
+ 				current [11] = new LargeStruct2 [1];
++
++			/* Test for 64 bit bitmap descriptors (#14834) */
++			current [12] = new Non32bitBitmap () { o = new object (), i32 = 1, i33 = 1, i34 = 1, i35 = 1, o2 = new object () };
+ 	
+ 			current = (object[])current [0];
+ 		}
+-- 
+1.8.4
+

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2014-03-03 13:02:51 UTC (rev 206613)
+++ testing-x86_64/PKGBUILD	2014-03-03 13:36:25 UTC (rev 206614)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
-# Contributor: Brice Carpentier <brice at dlfp.org>
-
-pkgname=mono
-pkgver=3.2.8
-pkgrel=1
-pkgdesc="Free implementation of the .NET platform including runtime and compiler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
-url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=2.10' 'sh' 'python')
-options=('!makeflags')
-provides=('monodoc')
-conflicts=('monodoc')
-source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
-        mono.binfmt.d
-        sgen_fix.patch)
-md5sums=('1075f99bd8a69890af9e30309728e684'
-         'b9ef8a65fea497acf176cca16c1e2402'
-         '8a700b94bff7a913f920e95890d2fb4c')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  # build mono
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --bindir=/usr/bin \
-    --sbindir=/usr/bin \
-    --disable-quiet-build \
-    --disable-system-aot \
-    --disable-static
-  make
-
-  # build jay
-  cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # install jay
-  pushd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
-  make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install
-  popd
-
-  # install binfmt conf file and pathes
-  install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf
-
-  #install license
-  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m644 mcs/MIT.X11 "${pkgdir}"/usr/share/licenses/${pkgname}/
-
-  #fix .pc file to be able to request mono on what it depends, fixes #go-oo build
-  sed -i -e "s:#Requires:Requires:" "${pkgdir}"/usr/lib/pkgconfig/mono.pc
-}

Copied: mono/repos/testing-x86_64/PKGBUILD (from rev 206613, mono/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-03-03 13:36:25 UTC (rev 206614)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: Brice Carpentier <brice at dlfp.org>
+
+pkgname=mono
+pkgver=3.2.8
+pkgrel=1
+pkgdesc="Free implementation of the .NET platform including runtime and compiler"
+arch=(i686 x86_64)
+license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
+url="http://www.mono-project.com/"
+depends=('zlib' 'libgdiplus>=2.10' 'sh' 'python')
+options=('!makeflags')
+provides=('monodoc')
+conflicts=('monodoc')
+source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
+        mono.binfmt.d
+        sgen_fix.patch)
+md5sums=('1075f99bd8a69890af9e30309728e684'
+         'b9ef8a65fea497acf176cca16c1e2402'
+         '8a700b94bff7a913f920e95890d2fb4c')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  # build mono
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --bindir=/usr/bin \
+    --sbindir=/usr/bin \
+    --disable-quiet-build \
+    --disable-system-aot \
+    --disable-static
+  make
+
+  # build jay
+  cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  # install jay
+  pushd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
+  make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install
+  popd
+
+  # install binfmt conf file and pathes
+  install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf
+
+  #install license
+  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 mcs/MIT.X11 "${pkgdir}"/usr/share/licenses/${pkgname}/
+
+  #fix .pc file to be able to request mono on what it depends, fixes #go-oo build
+  sed -i -e "s:#Requires:Requires:" "${pkgdir}"/usr/lib/pkgconfig/mono.pc
+}

Deleted: testing-x86_64/bug434892.patch
===================================================================
--- testing-x86_64/bug434892.patch	2014-03-03 13:02:51 UTC (rev 206613)
+++ testing-x86_64/bug434892.patch	2014-03-03 13:36:25 UTC (rev 206614)
@@ -1,11 +0,0 @@
---- trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/07/01 20:17:46	107006
-+++ trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/10/28 09:32:46	117243
-@@ -177,7 +177,7 @@
- 				foreach (OperationMessage om in op.Messages) {
- 					Message msg = ctx.Services.GetMessage (om.Message);
- 					foreach (MessagePart part in msg.Parts)
--						parts.Add (part,part);
-+						parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
- 				}
- 			}
- 			

Copied: mono/repos/testing-x86_64/bug434892.patch (from rev 206613, mono/trunk/bug434892.patch)
===================================================================
--- testing-x86_64/bug434892.patch	                        (rev 0)
+++ testing-x86_64/bug434892.patch	2014-03-03 13:36:25 UTC (rev 206614)
@@ -0,0 +1,11 @@
+--- trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/07/01 20:17:46	107006
++++ trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/10/28 09:32:46	117243
+@@ -177,7 +177,7 @@
+ 				foreach (OperationMessage om in op.Messages) {
+ 					Message msg = ctx.Services.GetMessage (om.Message);
+ 					foreach (MessagePart part in msg.Parts)
+-						parts.Add (part,part);
++						parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
+ 				}
+ 			}
+ 			

Deleted: testing-x86_64/mono.binfmt.d
===================================================================
--- testing-x86_64/mono.binfmt.d	2014-03-03 13:02:51 UTC (rev 206613)
+++ testing-x86_64/mono.binfmt.d	2014-03-03 13:36:25 UTC (rev 206614)
@@ -1 +0,0 @@
-:CLR:M::MZ::/usr/bin/mono:

Copied: mono/repos/testing-x86_64/mono.binfmt.d (from rev 206613, mono/trunk/mono.binfmt.d)
===================================================================
--- testing-x86_64/mono.binfmt.d	                        (rev 0)
+++ testing-x86_64/mono.binfmt.d	2014-03-03 13:36:25 UTC (rev 206614)
@@ -0,0 +1 @@
+:CLR:M::MZ::/usr/bin/mono:

Deleted: testing-x86_64/sgen_fix.patch
===================================================================
--- testing-x86_64/sgen_fix.patch	2014-03-03 13:02:51 UTC (rev 206613)
+++ testing-x86_64/sgen_fix.patch	2014-03-03 13:36:25 UTC (rev 206614)
@@ -1,112 +0,0 @@
-From d2cc22580898df5d4a15e0f99ab513e1570a6082 Mon Sep 17 00:00:00 2001
-From: Zoltan Varga <vargaz at gmail.com>
-Date: Fri, 20 Sep 2013 19:06:34 +0200
-Subject: [PATCH] [sgen] Use __builtin_ctzl () in OBJ_BITMAP_FOREACH_PTR () on
- 64 bit platforms. Fixes #14834.
-
----
- mono/metadata/sgen-descriptor.h | 28 +++++++++++++++++++++++++---
- mono/tests/sgen-descriptors.cs  | 15 +++++++++++++--
- 2 files changed, 38 insertions(+), 5 deletions(-)
-
-diff --git a/mono/metadata/sgen-descriptor.h b/mono/metadata/sgen-descriptor.h
-index cd53a86..3a00589 100644
---- a/mono/metadata/sgen-descriptor.h
-+++ b/mono/metadata/sgen-descriptor.h
-@@ -170,21 +170,43 @@ enum {
- 		}	\
- 	} while (0)
- 
--#ifdef __GNUC__
-+#if defined(__GNUC__) && SIZEOF_VOID_P==4
-+#define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
-+		/* there are pointers */        \
-+		void **_objptr = (void**)(obj); \
-+		gsize _bmap = (desc) >> 16;     \
-+		_objptr += OBJECT_HEADER_WORDS; \
-+		{ \
-+			int _index = __builtin_ctz (_bmap);		\
-+			_objptr += _index; \
-+			_bmap >>= (_index + 1);				\
-+			HANDLE_PTR (_objptr, (obj));		\
-+			_objptr ++;							\
-+			} \
-+		while (_bmap) { \
-+			int _index = __builtin_ctz (_bmap);		\
-+			_objptr += _index; \
-+			_bmap >>= (_index + 1);				\
-+			HANDLE_PTR (_objptr, (obj));		\
-+			_objptr ++;							\
-+		}										\
-+	} while (0)
-+#elif defined(__GNUC__) && SIZEOF_VOID_P==8
-+/* Same as above, but use _builtin_ctzl () */
- #define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
- 		/* there are pointers */        \
- 		void **_objptr = (void**)(obj); \
- 		gsize _bmap = (desc) >> 16;     \
- 		_objptr += OBJECT_HEADER_WORDS; \
- 		{ \
--			int _index = __builtin_ctz (_bmap); \
-+			int _index = __builtin_ctzl (_bmap);		\
- 			_objptr += _index; \
- 			_bmap >>= (_index + 1);				\
- 			HANDLE_PTR (_objptr, (obj));		\
- 			_objptr ++;							\
- 			} \
- 		while (_bmap) { \
--			int _index = __builtin_ctz (_bmap); \
-+			int _index = __builtin_ctzl (_bmap);		\
- 			_objptr += _index; \
- 			_bmap >>= (_index + 1);				\
- 			HANDLE_PTR (_objptr, (obj));		\
-diff --git a/mono/tests/sgen-descriptors.cs b/mono/tests/sgen-descriptors.cs
-index ae00084..246e5aa 100644
---- a/mono/tests/sgen-descriptors.cs
-+++ b/mono/tests/sgen-descriptors.cs
-@@ -1,4 +1,5 @@
- using System;
-+using System.Runtime.InteropServices;
- 
- public struct SmallMixed
- {
-@@ -47,6 +48,13 @@ public class HugePtrFree {
- 	public LargeStruct2 c;
- }
- 
-+[StructLayout (LayoutKind.Sequential)]
-+public class Non32bitBitmap {
-+	public object o;
-+	public long i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15, i16, i17, i18, i19, i20, i21, i22, i23, i24, i25, i26, i27, i28, i29, i30, i31, i32, i33, i34, i35;
-+	public object o2;
-+}
-+
- /*
- This is a stress test for descriptors.
- */
-@@ -54,10 +62,10 @@ class Driver {
- 	static char[] FOO = new char[] { 'f', 'o', 'b' };
- 
- 	static void Fill (int cycles) {
--		object[] root = new object [12];
-+		object[] root = new object [13];
- 		object[] current = root;
- 		for (int i = 0; i < cycles; ++i) {
--			current [0] = new object [12];
-+			current [0] = new object [13];
- 			current [1] = new int [6];
- 			current [2] = new int [2,3];
- 			current [3] = new string (FOO);
-@@ -72,6 +80,9 @@ class Driver {
- 				current [10] = new HugePtrFree ();
- 			if ((i %  10000) == 0)
- 				current [11] = new LargeStruct2 [1];
-+
-+			/* Test for 64 bit bitmap descriptors (#14834) */
-+			current [12] = new Non32bitBitmap () { o = new object (), i32 = 1, i33 = 1, i34 = 1, i35 = 1, o2 = new object () };
- 	
- 			current = (object[])current [0];
- 		}
--- 
-1.8.4
-

Copied: mono/repos/testing-x86_64/sgen_fix.patch (from rev 206613, mono/trunk/sgen_fix.patch)
===================================================================
--- testing-x86_64/sgen_fix.patch	                        (rev 0)
+++ testing-x86_64/sgen_fix.patch	2014-03-03 13:36:25 UTC (rev 206614)
@@ -0,0 +1,112 @@
+From d2cc22580898df5d4a15e0f99ab513e1570a6082 Mon Sep 17 00:00:00 2001
+From: Zoltan Varga <vargaz at gmail.com>
+Date: Fri, 20 Sep 2013 19:06:34 +0200
+Subject: [PATCH] [sgen] Use __builtin_ctzl () in OBJ_BITMAP_FOREACH_PTR () on
+ 64 bit platforms. Fixes #14834.
+
+---
+ mono/metadata/sgen-descriptor.h | 28 +++++++++++++++++++++++++---
+ mono/tests/sgen-descriptors.cs  | 15 +++++++++++++--
+ 2 files changed, 38 insertions(+), 5 deletions(-)
+
+diff --git a/mono/metadata/sgen-descriptor.h b/mono/metadata/sgen-descriptor.h
+index cd53a86..3a00589 100644
+--- a/mono/metadata/sgen-descriptor.h
++++ b/mono/metadata/sgen-descriptor.h
+@@ -170,21 +170,43 @@ enum {
+ 		}	\
+ 	} while (0)
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && SIZEOF_VOID_P==4
++#define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
++		/* there are pointers */        \
++		void **_objptr = (void**)(obj); \
++		gsize _bmap = (desc) >> 16;     \
++		_objptr += OBJECT_HEADER_WORDS; \
++		{ \
++			int _index = __builtin_ctz (_bmap);		\
++			_objptr += _index; \
++			_bmap >>= (_index + 1);				\
++			HANDLE_PTR (_objptr, (obj));		\
++			_objptr ++;							\
++			} \
++		while (_bmap) { \
++			int _index = __builtin_ctz (_bmap);		\
++			_objptr += _index; \
++			_bmap >>= (_index + 1);				\
++			HANDLE_PTR (_objptr, (obj));		\
++			_objptr ++;							\
++		}										\
++	} while (0)
++#elif defined(__GNUC__) && SIZEOF_VOID_P==8
++/* Same as above, but use _builtin_ctzl () */
+ #define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
+ 		/* there are pointers */        \
+ 		void **_objptr = (void**)(obj); \
+ 		gsize _bmap = (desc) >> 16;     \
+ 		_objptr += OBJECT_HEADER_WORDS; \
+ 		{ \
+-			int _index = __builtin_ctz (_bmap); \
++			int _index = __builtin_ctzl (_bmap);		\
+ 			_objptr += _index; \
+ 			_bmap >>= (_index + 1);				\
+ 			HANDLE_PTR (_objptr, (obj));		\
+ 			_objptr ++;							\
+ 			} \
+ 		while (_bmap) { \
+-			int _index = __builtin_ctz (_bmap); \
++			int _index = __builtin_ctzl (_bmap);		\
+ 			_objptr += _index; \
+ 			_bmap >>= (_index + 1);				\
+ 			HANDLE_PTR (_objptr, (obj));		\
+diff --git a/mono/tests/sgen-descriptors.cs b/mono/tests/sgen-descriptors.cs
+index ae00084..246e5aa 100644
+--- a/mono/tests/sgen-descriptors.cs
++++ b/mono/tests/sgen-descriptors.cs
+@@ -1,4 +1,5 @@
+ using System;
++using System.Runtime.InteropServices;
+ 
+ public struct SmallMixed
+ {
+@@ -47,6 +48,13 @@ public class HugePtrFree {
+ 	public LargeStruct2 c;
+ }
+ 
++[StructLayout (LayoutKind.Sequential)]
++public class Non32bitBitmap {
++	public object o;
++	public long i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15, i16, i17, i18, i19, i20, i21, i22, i23, i24, i25, i26, i27, i28, i29, i30, i31, i32, i33, i34, i35;
++	public object o2;
++}
++
+ /*
+ This is a stress test for descriptors.
+ */
+@@ -54,10 +62,10 @@ class Driver {
+ 	static char[] FOO = new char[] { 'f', 'o', 'b' };
+ 
+ 	static void Fill (int cycles) {
+-		object[] root = new object [12];
++		object[] root = new object [13];
+ 		object[] current = root;
+ 		for (int i = 0; i < cycles; ++i) {
+-			current [0] = new object [12];
++			current [0] = new object [13];
+ 			current [1] = new int [6];
+ 			current [2] = new int [2,3];
+ 			current [3] = new string (FOO);
+@@ -72,6 +80,9 @@ class Driver {
+ 				current [10] = new HugePtrFree ();
+ 			if ((i %  10000) == 0)
+ 				current [11] = new LargeStruct2 [1];
++
++			/* Test for 64 bit bitmap descriptors (#14834) */
++			current [12] = new Non32bitBitmap () { o = new object (), i32 = 1, i33 = 1, i34 = 1, i35 = 1, o2 = new object () };
+ 	
+ 			current = (object[])current [0];
+ 		}
+-- 
+1.8.4
+




More information about the arch-commits mailing list