From 57379497b2644e3d45baf5f751d0949d01bebd01 Mon Sep 17 00:00:00 2001 From: recht Date: Wed, 3 Dec 2003 17:08:24 +0000 Subject: update to 0.29 lots of updates fixes see http://www.go-mono.com/archive/mono-0.29.html for details --- lang/mono/patches/patch-ac | 10 +++--- lang/mono/patches/patch-ad | 8 ++--- lang/mono/patches/patch-ae | 41 --------------------- lang/mono/patches/patch-af | 21 ----------- lang/mono/patches/patch-ag | 88 ---------------------------------------------- lang/mono/patches/patch-ah | 2 +- lang/mono/patches/patch-ai | 2 +- lang/mono/patches/patch-aj | 2 +- lang/mono/patches/patch-ak | 2 +- 9 files changed, 13 insertions(+), 163 deletions(-) delete mode 100644 lang/mono/patches/patch-ae delete mode 100644 lang/mono/patches/patch-af delete mode 100644 lang/mono/patches/patch-ag (limited to 'lang/mono/patches') diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac index 89654510563..efa3fc3ce73 100644 --- a/lang/mono/patches/patch-ac +++ b/lang/mono/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2003/09/25 16:05:21 recht Exp $ +$NetBSD: patch-ac,v 1.4 2003/12/03 17:08:24 recht Exp $ ---- data/Makefile.in.orig 2003-08-14 08:00:52.000000000 +0200 -+++ data/Makefile.in 2003-09-25 01:58:12.000000000 +0200 -@@ -114,7 +114,7 @@ +--- data/Makefile.in.orig 2003-11-13 13:03:51.000000000 +0100 ++++ data/Makefile.in 2003-11-13 16:22:41.000000000 +0100 +@@ -117,7 +117,7 @@ libgc_dir = @libgc_dir@ libmono_cflags = @libmono_cflags@ libmono_ldflags = @libmono_ldflags@ -monodir = $(sysconfdir)/mono +monodir = $(datadir)/examples/mono - EXTRA_DIST = config.in machine.config + EXTRA_DIST = config.in machine.config DefaultWsdlHelpGenerator.aspx diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad index b46608a71f8..8c5038b7349 100644 --- a/lang/mono/patches/patch-ad +++ b/lang/mono/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2003/10/02 08:41:42 recht Exp $ +$NetBSD: patch-ad,v 1.4 2003/12/03 17:08:24 recht Exp $ ---- mono/metadata/icall.c.orig 2003-09-26 18:25:40.000000000 +0200 -+++ mono/metadata/icall.c 2003-10-02 10:24:51.000000000 +0200 -@@ -3554,7 +3554,7 @@ +--- mono/metadata/icall.c.orig 2003-11-12 18:22:22.000000000 +0100 ++++ mono/metadata/icall.c 2003-11-13 16:22:57.000000000 +0100 +@@ -3796,7 +3796,7 @@ MONO_ARCH_SAVE_REGS; diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae deleted file mode 100644 index 2dc91e85408..00000000000 --- a/lang/mono/patches/patch-ae +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2003/09/25 16:05:21 recht Exp $ - ---- mono/mini/mini-x86.c.orig 2003-08-05 12:32:07.000000000 +0200 -+++ mono/mini/mini-x86.c 2003-09-25 01:55:36.000000000 +0200 -@@ -7,6 +7,10 @@ - * - * (C) 2003 Ximian, Inc. - */ -+ -+#include -+#include -+ - #include "mini.h" - #include - #include -@@ -19,6 +23,13 @@ - #include "inssel.h" - #include "cpu-pentium.h" - -+/* XXX OpenBSD port. */ -+extern int OPENBSD__signbitd(double); -+extern int OPENBSD__signbitf(float); -+#undef signbit -+#define signbit(x) (sizeof(x) == sizeof(float) ? \ -+ OPENBSD__signbitf(x) : OPENBSD__signbitd(x)) -+ - const char* - mono_arch_regname (int reg) { - switch (reg) { -@@ -400,7 +411,11 @@ - - if (have_cpuid) { - CpuidFunc func = (CpuidFunc)cpuid_impl; -+ if (mprotect (func, sizeof(cpuid_impl), PROT_EXEC | PROT_READ) == -1) -+ g_error ("mprotect failed\n"); - func (id, p_eax, p_ebx, p_ecx, p_edx); -+ /*if (mprotect (func, sizeof(cpuid_impl), PROT_WRITE | PROT_READ) == -1) -+ g_error ("mprotect failed\n");*/ - /* - * We use this approach because of issues with gcc and pic code, see: - * http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view%20audit-trail&database=gcc&pr=7329 diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af deleted file mode 100644 index 4ef17f97771..00000000000 --- a/lang/mono/patches/patch-af +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-af,v 1.2 2003/10/02 08:41:42 recht Exp $ - ---- mono/mini/Makefile.in.orig 2003-10-01 18:59:02.000000000 +0200 -+++ mono/mini/Makefile.in 2003-10-02 10:25:53.000000000 +0200 -@@ -181,6 +181,7 @@ - mini-x86.c \ - mini-x86.h \ - exceptions-x86.c \ -+ OPENBSD_signbit.c \ - tramp-x86.c - - -@@ -271,7 +272,7 @@ - linear-scan.lo aot.lo graph.lo - am__objects_2 = mini-ppc.lo exceptions-ppc.lo tramp-ppc.lo - am__objects_3 = mini-sparc.lo exceptions-sparc.lo tramp-sparc.lo --am__objects_4 = mini-x86.lo exceptions-x86.lo tramp-x86.lo -+am__objects_4 = mini-x86.lo exceptions-x86.lo tramp-x86.lo OPENBSD_signbit.lo - @POWERPC_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_2) - @SPARC_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_3) - @X86_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_4) diff --git a/lang/mono/patches/patch-ag b/lang/mono/patches/patch-ag deleted file mode 100644 index 491643126c7..00000000000 --- a/lang/mono/patches/patch-ag +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2003/09/25 16:05:21 recht Exp $ - ---- /dev/null 2003-09-25 01:52:37.000000000 +0200 -+++ mono/mini/OPENBSD_signbit.c 2003-09-25 01:55:36.000000000 +0200 -@@ -0,0 +1,83 @@ -+/* -+ * Copyright 2003 Marius Aamodt Eriksen -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* XXX this is for little endian machines */ -+ -+#include -+ -+int OPENBSD__signbitd(double); -+int OPENBSD__signbitf(float); -+ -+typedef union -+{ -+ double value; -+ struct -+ { -+ u_int32_t lsw; -+ u_int32_t msw; -+ } parts; -+} ieee_double_shape_type; -+ -+typedef union -+{ -+ float value; -+ u_int32_t word; -+} ieee_float_shape_type; -+ -+#define GET_HIGH_WORD(i,d) \ -+do { \ -+ ieee_double_shape_type gh_u; \ -+ gh_u.value = (d); \ -+ (i) = gh_u.parts.msw; \ -+} while (0) -+ -+#define GET_FLOAT_WORD(i,d) \ -+do { \ -+ ieee_float_shape_type gf_u; \ -+ gf_u.value = (d); \ -+ (i) = gf_u.word; \ -+} while (0) -+ -+int -+OPENBSD__signbitd(double d) -+{ -+ int32_t hw; -+ -+ GET_HIGH_WORD(hw, d); -+ -+ return (hw >> 31); -+} -+ -+int -+OPENBSD__signbitf(float f) -+{ -+ int32_t hw; -+ -+ GET_FLOAT_WORD(hw, f); -+ -+ return (hw >> 31); -+} diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah index bd707abcf79..89ff9c4a7bc 100644 --- a/lang/mono/patches/patch-ah +++ b/lang/mono/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.3 2003/12/03 00:12:12 recht Exp $ +$NetBSD: patch-ah,v 1.4 2003/12/03 17:08:24 recht Exp $ --- libgc/os_dep.c.orig 2003-08-26 23:21:14.000000000 +0200 +++ libgc/os_dep.c 2003-11-27 18:34:40.000000000 +0100 diff --git a/lang/mono/patches/patch-ai b/lang/mono/patches/patch-ai index 2b69aabf599..361e17adda4 100644 --- a/lang/mono/patches/patch-ai +++ b/lang/mono/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.1 2003/12/03 00:12:12 recht Exp $ +$NetBSD: patch-ai,v 1.2 2003/12/03 17:08:24 recht Exp $ --- configure.orig 2003-11-27 18:35:28.000000000 +0100 +++ configure 2003-11-27 18:39:04.000000000 +0100 diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj index 8bebb9642c0..534b18139e0 100644 --- a/lang/mono/patches/patch-aj +++ b/lang/mono/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.1 2003/12/03 00:12:12 recht Exp $ +$NetBSD: patch-aj,v 1.2 2003/12/03 17:08:24 recht Exp $ --- libgc/include/private/gcconfig.h.orig 2003-08-26 23:01:26.000000000 +0200 +++ libgc/include/private/gcconfig.h 2003-11-27 18:42:00.000000000 +0100 diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak index c473abb5b2d..0e8b31cf4df 100644 --- a/lang/mono/patches/patch-ak +++ b/lang/mono/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.1 2003/12/03 00:12:12 recht Exp $ +$NetBSD: patch-ak,v 1.2 2003/12/03 17:08:24 recht Exp $ --- mono/metadata/mono-config.c.orig 2003-11-27 21:10:10.000000000 +0100 +++ mono/metadata/mono-config.c 2003-11-27 21:12:30.000000000 +0100 -- cgit v1.2.3