summaryrefslogtreecommitdiff
path: root/lang/mono/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/mono/patches')
-rw-r--r--lang/mono/patches/patch-aa23
-rw-r--r--lang/mono/patches/patch-ab26
-rw-r--r--lang/mono/patches/patch-ac6
-rw-r--r--lang/mono/patches/patch-ad21
-rw-r--r--lang/mono/patches/patch-ae61
-rw-r--r--lang/mono/patches/patch-af4
-rw-r--r--lang/mono/patches/patch-aj4
-rw-r--r--lang/mono/patches/patch-ak10
-rw-r--r--lang/mono/patches/patch-am6
-rw-r--r--lang/mono/patches/patch-an10
-rw-r--r--lang/mono/patches/patch-ba6
-rw-r--r--lang/mono/patches/patch-bc6
12 files changed, 42 insertions, 141 deletions
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa
deleted file mode 100644
index c51e1fdf868..00000000000
--- a/lang/mono/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2005/07/31 15:26:58 recht Exp $
-
---- configure.in.orig 2005-07-27 02:06:43.000000000 +0200
-+++ configure.in
-@@ -70,6 +70,18 @@ case "$host" in
- ;;
- *-*-*netbsd*)
- platform_win32=no
-+ CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
-+ libmono_cflags="-D_REENTRANT"
-+ LDFLAGS="$LDFLAGS -pthread"
-+ libmono_ldflags="-pthread"
-+ need_link_unlink=yes
-+ libdl="-ldl /libexec/ld.elf_so"
-+ libgc_threads=pthreads
-+ with_tls=__thread
-+ with_sigaltstack=yes
-+ ;;
-+ *-*-*netbsd*)
-+ platform_win32=no
- CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- libmono_cflags="-D_REENTRANT"
- LDFLAGS="$LDFLAGS -pthread"
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index 46e99be34d5..edf98ea2468 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,23 +1,23 @@
-$NetBSD: patch-ab,v 1.11 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-ab,v 1.12 2006/01/03 08:03:53 recht Exp $
---- configure.orig 2005-07-27 02:08:41.000000000 +0200
+--- configure.orig 2005-12-22 18:35:26.000000000 +0100
+++ configure
-@@ -2224,6 +2224,18 @@ _ACEOF
+@@ -2232,13 +2232,15 @@ _ACEOF
;;
*-*-*netbsd*)
platform_win32=no
+- CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
-+ libmono_cflags="-D_REENTRANT"
-+ LDFLAGS="$LDFLAGS -pthread"
-+ libmono_ldflags="-pthread"
-+ need_link_unlink=yes
+ libmono_cflags="-D_REENTRANT"
+ LDFLAGS="$LDFLAGS -pthread"
+ libmono_ldflags="-pthread"
+ need_link_unlink=yes
+- libdl=
+- libgc_threads=no
+ libdl="-ldl /libexec/ld.elf_so"
+ libgc_threads=pthreads
+ with_tls=__thread
+ with_sigaltstack=yes
-+ ;;
-+ *-*-*netbsd*)
-+ platform_win32=no
- CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- libmono_cflags="-D_REENTRANT"
- LDFLAGS="$LDFLAGS -pthread"
+ ;;
+ # these flags will work for all versions of -STABLE
+ #
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index e145a46f30d..a1f592a9c8b 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-ac,v 1.13 2006/01/03 08:03:53 recht Exp $
---- data/Makefile.in.orig 2005-07-27 02:08:24.000000000 +0200
+--- data/Makefile.in.orig 2005-12-22 18:35:08.000000000 +0100
+++ data/Makefile.in
-@@ -264,7 +264,7 @@ target_cpu = @target_cpu@
+@@ -271,7 +271,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = net_1_1 net_2_0
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
deleted file mode 100644
index e947bc5dbf7..00000000000
--- a/lang/mono/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.12 2005/07/31 15:26:58 recht Exp $
-
---- libgc/configure.in.orig 2005-05-19 15:24:22.000000000 +0200
-+++ libgc/configure.in
-@@ -84,7 +84,15 @@ case "$THREADS" in
- AC_DEFINE(GC_LINUX_THREADS)
- AC_DEFINE(_REENTRANT)
- ;;
-- *-*-aix*)
-+ *-*-netbsd*)
-+ AC_DEFINE(GC_NETBSD_THREADS)
-+ AC_DEFINE(_REENTRANT)
-+ AC_DEFINE(THREAD_LOCAL_ALLOC)
-+ if test "${enable_parallel_mark}" = yes; then
-+ AC_DEFINE(PARALLEL_MARK)
-+ fi
-+ ;;
-+ *-*-aix*)
- AC_DEFINE(GC_AIX_THREADS)
- AC_DEFINE(_REENTRANT)
- ;;
diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae
index e121d4893c2..cda724cf7ca 100644
--- a/lang/mono/patches/patch-ae
+++ b/lang/mono/patches/patch-ae
@@ -1,54 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-ae,v 1.8 2006/01/03 08:03:53 recht Exp $
---- libgc/configure.orig 2005-07-27 02:08:52.000000000 +0200
+--- libgc/configure.orig 2005-12-22 18:35:37.000000000 +0100
+++ libgc/configure
-@@ -465,7 +465,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os GC_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GC_CFLAGS THREADLIBS POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE EXTRA_TEST_LIBS target_all CPLUSPLUS_TRUE CPLUSPLUS_FALSE INCLUDES CXXINCLUDES addobjs addincludes addlibs addtests EGREP LN_S ECHO CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MY_CFLAGS UNWINDLIBS USE_LIBDIR_TRUE USE_LIBDIR_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os GC_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GC_CFLAGS THREADLIBS POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE EXTRA_TEST_LIBS target_all CPLUSPLUS_TRUE CPLUSPLUS_FALSE INCLUDES CXXINCLUDES addobjs addincludes addlibs addtests EGREP LN_S ECHO CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MY_CFLAGS UNWINDLIBS USE_LIBDIR_TRUE USE_LIBDIR_FALSE LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -930,14 +930,6 @@ ac_env_CXXFLAGS_set=${CXXFLAGS+set}
- ac_env_CXXFLAGS_value=$CXXFLAGS
- ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
- ac_cv_env_CXXFLAGS_value=$CXXFLAGS
--ac_env_CCAS_set=${CCAS+set}
--ac_env_CCAS_value=$CCAS
--ac_cv_env_CCAS_set=${CCAS+set}
--ac_cv_env_CCAS_value=$CCAS
--ac_env_CCASFLAGS_set=${CCASFLAGS+set}
--ac_env_CCASFLAGS_value=$CCASFLAGS
--ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set}
--ac_cv_env_CCASFLAGS_value=$CCASFLAGS
- ac_env_CPP_set=${CPP+set}
- ac_env_CPP_value=$CPP
- ac_cv_env_CPP_set=${CPP+set}
-@@ -1074,8 +1066,6 @@ Some influential environment variables:
- headers in a nonstandard directory <include dir>
- CXX C++ compiler command
- CXXFLAGS C++ compiler flags
-- CCAS assembler compiler command (defaults to CC)
-- CCASFLAGS assembler compiler flags (defaults to CFLAGS)
- CPP C preprocessor
- CXXCPP C++ preprocessor
- F77 Fortran 77 compiler command
-@@ -3588,12 +3578,6 @@ fi
-
-
-
--# By default we simply use the C compiler to build assembly code.
--
--test "${CCAS+set}" = set || CCAS=$CC
--test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
--
--
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-@@ -3933,7 +3917,27 @@ _ACEOF
+@@ -3940,7 +3940,27 @@ _ACEOF
_ACEOF
;;
@@ -77,12 +31,3 @@ $NetBSD: patch-ae,v 1.7 2005/07/31 15:26:58 recht Exp $
cat >>confdefs.h <<\_ACEOF
#define GC_AIX_THREADS 1
_ACEOF
-@@ -21287,8 +21291,6 @@ s,@ac_ct_CXX@,$ac_ct_CXX,;t t
- s,@CXXDEPMODE@,$CXXDEPMODE,;t t
- s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
- s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
--s,@CCAS@,$CCAS,;t t
--s,@CCASFLAGS@,$CCASFLAGS,;t t
- s,@AR@,$AR,;t t
- s,@ac_ct_AR@,$ac_ct_AR,;t t
- s,@RANLIB@,$RANLIB,;t t
diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af
index 86a6009a364..1142e286d79 100644
--- a/lang/mono/patches/patch-af
+++ b/lang/mono/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.7 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-af,v 1.8 2006/01/03 08:03:53 recht Exp $
---- mono/metadata/Makefile.in.orig 2005-07-27 02:08:30.000000000 +0200
+--- mono/metadata/Makefile.in.orig 2005-12-22 18:35:15.000000000 +0100
+++ mono/metadata/Makefile.in
@@ -68,7 +68,7 @@ am__objects_1 = reflection.lo object.lo
am_libmonoruntime_static_la_OBJECTS = $(am__objects_1)
diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj
index 72e9e3d3ddd..f6e3db0a3af 100644
--- a/lang/mono/patches/patch-aj
+++ b/lang/mono/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.4 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-aj,v 1.5 2006/01/03 08:03:53 recht Exp $
---- libgc/pthread_stop_world.c.orig 2005-07-05 20:46:03.000000000 +0200
+--- libgc/pthread_stop_world.c.orig 2005-07-05 20:42:42.000000000 +0200
+++ libgc/pthread_stop_world.c
@@ -99,6 +99,7 @@ word GC_stop_count; /* Incremented at th
# endif
diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak
index 3013ed1964f..b09c15eafe3 100644
--- a/lang/mono/patches/patch-ak
+++ b/lang/mono/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.6 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-ak,v 1.7 2006/01/03 08:03:53 recht Exp $
---- libgc/pthread_support.c.orig 2005-06-19 11:59:53.000000000 +0200
+--- libgc/pthread_support.c.orig 2005-12-07 06:42:46.000000000 +0100
+++ libgc/pthread_support.c
@@ -68,7 +68,7 @@
# endif
@@ -23,7 +23,7 @@ $NetBSD: patch-ak,v 1.6 2005/07/31 15:26:58 recht Exp $
#if defined(GC_DGUX386_THREADS)
# include <sys/dg_sys_info.h>
-@@ -956,7 +959,7 @@ void GC_thr_init()
+@@ -978,7 +981,7 @@ void GC_thr_init()
# if defined(GC_FREEBSD_THREADS)
GC_nprocs = 1;
# endif
@@ -32,7 +32,7 @@ $NetBSD: patch-ak,v 1.6 2005/07/31 15:26:58 recht Exp $
int ncpus = 1;
size_t len = sizeof(ncpus);
sysctl((int[2]) {CTL_HW, HW_NCPU}, 2, &ncpus, &len, NULL, 0);
-@@ -1093,8 +1096,24 @@ void GC_end_blocking(void) {
+@@ -1115,8 +1118,24 @@ void GC_end_blocking(void) {
#define __d10_sleep sleep
#endif /* GC_DGUX386_THREADS */
@@ -58,7 +58,7 @@ $NetBSD: patch-ak,v 1.6 2005/07/31 15:26:58 recht Exp $
{
int result;
-@@ -1104,6 +1123,19 @@ int WRAP_FUNC(sleep) (unsigned int secon
+@@ -1126,6 +1145,19 @@ int WRAP_FUNC(sleep) (unsigned int secon
return result;
}
diff --git a/lang/mono/patches/patch-am b/lang/mono/patches/patch-am
index 33ccba0881a..7bfc2cbb3af 100644
--- a/lang/mono/patches/patch-am
+++ b/lang/mono/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-am,v 1.2 2006/01/03 08:03:53 recht Exp $
---- mono/io-layer/collection.c.orig 2005-04-21 13:46:55.000000000 +0200
+--- mono/io-layer/collection.c.orig 2005-10-19 13:24:08.000000000 +0200
+++ mono/io-layer/collection.c
-@@ -53,7 +53,7 @@ void _wapi_collection_init (void)
+@@ -60,7 +60,7 @@ void _wapi_collection_init (void)
g_assert (ret == 0);
#ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE
diff --git a/lang/mono/patches/patch-an b/lang/mono/patches/patch-an
index 5771fa5e4da..eb306f05fba 100644
--- a/lang/mono/patches/patch-an
+++ b/lang/mono/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-an,v 1.2 2006/01/03 08:03:53 recht Exp $
---- mono/mini/exceptions-x86.c.orig 2005-04-11 16:16:27.000000000 +0200
+--- mono/mini/exceptions-x86.c.orig 2005-09-15 13:21:13.000000000 +0200
+++ mono/mini/exceptions-x86.c
-@@ -563,7 +563,17 @@ mono_arch_sigctx_to_monoctx (void *sigct
+@@ -688,7 +688,17 @@ mono_arch_sigctx_to_monoctx (void *sigct
mctx->esi = ctx->uc_mcontext.mc_esi;
mctx->edi = ctx->uc_mcontext.mc_edi;
mctx->eip = ctx->uc_mcontext.mc_eip;
@@ -21,7 +21,7 @@ $NetBSD: patch-an,v 1.1 2005/07/31 15:26:58 recht Exp $
mctx->eax = ctx->uc_mcontext.gregs [REG_EAX];
mctx->ebx = ctx->uc_mcontext.gregs [REG_EBX];
mctx->ecx = ctx->uc_mcontext.gregs [REG_ECX];
-@@ -600,12 +610,21 @@ mono_arch_monoctx_to_sigctx (MonoContext
+@@ -725,12 +735,21 @@ mono_arch_monoctx_to_sigctx (MonoContext
ctx->uc_mcontext.mc_ebx = mctx->ebx;
ctx->uc_mcontext.mc_ecx = mctx->ecx;
ctx->uc_mcontext.mc_edx = mctx->edx;
@@ -45,7 +45,7 @@ $NetBSD: patch-an,v 1.1 2005/07/31 15:26:58 recht Exp $
#else
ctx->uc_mcontext.gregs [REG_EAX] = mctx->eax;
ctx->uc_mcontext.gregs [REG_EBX] = mctx->ebx;
-@@ -639,6 +658,8 @@ mono_arch_ip_from_context (void *sigctx)
+@@ -764,6 +783,8 @@ mono_arch_ip_from_context (void *sigctx)
ucontext_t *ctx = (ucontext_t*)sigctx;
#if defined(__FreeBSD__)
return (gpointer)ctx->uc_mcontext.mc_eip;
diff --git a/lang/mono/patches/patch-ba b/lang/mono/patches/patch-ba
index a6c89d938c6..b35dafeb00e 100644
--- a/lang/mono/patches/patch-ba
+++ b/lang/mono/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.5 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-ba,v 1.6 2006/01/03 08:03:53 recht Exp $
---- mono/cil/Makefile.in.orig 2005-07-27 02:08:28.000000000 +0200
+--- mono/cil/Makefile.in.orig 2005-12-22 18:35:13.000000000 +0100
+++ mono/cil/Makefile.in
-@@ -459,7 +459,7 @@ uninstall-am: uninstall-defDATA uninstal
+@@ -466,7 +466,7 @@ uninstall-am: uninstall-defDATA uninstal
uninstall-info-am uninstall-xmlDATA
opcode.def: make-opcodes-def.pl cil-opcodes.xml
diff --git a/lang/mono/patches/patch-bc b/lang/mono/patches/patch-bc
index bc2970c31f5..f77ec7e7913 100644
--- a/lang/mono/patches/patch-bc
+++ b/lang/mono/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.5 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-bc,v 1.6 2006/01/03 08:03:53 recht Exp $
---- mono/mini/Makefile.in.orig 2005-07-27 02:08:30.000000000 +0200
+--- mono/mini/Makefile.in.orig 2005-12-22 18:35:16.000000000 +0100
+++ mono/mini/Makefile.in
-@@ -1111,15 +1111,15 @@ mbench: test.exe
+@@ -1200,15 +1200,15 @@ mbench: test.exe
stat1: mono bench.exe
$(RUNTIME) --verbose --statfile stats.pl --regression bench.exe
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 07:11:27 +0000