Add support for 64-bit SunOS.

4 files changed, 91 insertions, 26 deletions

diff --git a/lang/mono2/Makefile b/lang/mono2/Makefile
index 22ed6a52c65..3e388ab361f 100644
--- a/lang/mono2/Makefile
+++ b/lang/mono2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/06/17 13:14:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/12 20:13:41 jperkin Exp $
 
 DISTNAME=	mono-2.10.9
 PKGREVISION=	3
@@ -149,9 +149,13 @@ SUBST_SED.fix-libx11=		-e 's,@X11BASE@,${X11BASE},g'
 CPPFLAGS.NetBSD+=	-D_KMEMUSER
 CPPFLAGS.SunOS+=	-D__C99FEATURES__
 
-.if ${OPSYS} == "SunOS"
+.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
 ULIMIT_CMD_datasize=	ulimit -d 262144
 ULIMIT_CMD_stacksize=	ulimit -s 10240
+.elif !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
+CONFIGURE_ARGS+=	--with-sigaltstack=no
+ULIMIT_CMD_datasize=	ulimit -d 524288
+ULIMIT_CMD_stacksize=	ulimit -s 10240
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/lang/mono2/distinfo b/lang/mono2/distinfo
index 11b3714d39b..7956ab19f74 100644
--- a/lang/mono2/distinfo
+++ b/lang/mono2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2013/06/17 13:14:41 jperkin Exp $
+$NetBSD: distinfo,v 1.3 2013/09/12 20:13:41 jperkin Exp $
 
 SHA1 (mono-2.10.9.tar.bz2) = 1a6e8c5a0c3d88d87982259aa04402e028a283de
 RMD160 (mono-2.10.9.tar.bz2) = ac9784c413eb2cdb490750a86a96cce5c11ad5bd
 Size (mono-2.10.9.tar.bz2) = 34038017 bytes
 SHA1 (patch-aa) = f3c88247c143cba6d0475f1dabb653adbc841bdb
-SHA1 (patch-ab) = f4d7c412a34e6ce5321361616888b601ff666cdd
+SHA1 (patch-ab) = bc7c65758bd4c24340ab75f42e6fae9831c0498b
 SHA1 (patch-ac) = 78f3b0786480e066959cc191e3f45d3f773220e2
 SHA1 (patch-ad) = 2dc253928695966b5310457b0cec52cd919a4851
 SHA1 (patch-ae) = 2b032ad658e8aa23c4e3825474d2d284b00557cd
@@ -28,7 +28,7 @@ SHA1 (patch-bg) = 7ac66455c304880e40bb915b8ba1f28ee57dd576
 SHA1 (patch-bh) = a42432fd8ed92e2213fbcd24bf29c2b6d4cbd8ba
 SHA1 (patch-bi) = 91786c858b459cd6b5a0dc683b5bdefc412973c1
 SHA1 (patch-cc) = 97b247ea353c6b0e08b96bdf0e6de74c5dcb60ef
-SHA1 (patch-da) = ec2299928595710331f1856450e46e1694b5c292
+SHA1 (patch-da) = adb2972f740ffb5dc71a9ec64ce6204db2ea276e
 SHA1 (patch-db) = 80e64ed5e475d7292eaea16decc1dd5a8123d5e0
 SHA1 (patch-dc) = e139e349217b213eea53a17fcae44fda0bbfe636
 SHA1 (patch-de) = d9867210a90389ff9ff5b9376b7091f923960973
diff --git a/lang/mono2/patches/patch-ab b/lang/mono2/patches/patch-ab
index 2b2c1ab5209..c3a99153a6c 100644
--- a/lang/mono2/patches/patch-ab
+++ b/lang/mono2/patches/patch-ab
@@ -1,7 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2013/06/17 12:43:28 wiz Exp $
---- configure.orig	2011-09-15 20:12:44.000000000 +0300
-+++ configure	2011-10-28 17:51:31.000000000 +0300
-@@ -3834,7 +3834,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1
+$NetBSD: patch-ab,v 1.2 2013/09/12 20:13:41 jperkin Exp $
+
+Support 64-bit SunOS.
+
+--- configure.orig	2012-02-01 20:48:05.000000000 +0000
++++ configure
+@@ -3699,7 +3699,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1
  		host_win32=yes
  		if test "x$cross_compiling" = "xno"; then
  			target_win32=yes
@@ -10,7 +13,7 @@ $NetBSD: patch-ab,v 1.1 2013/06/17 12:43:28 wiz Exp $
  
  $as_echo "#define TARGET_WIN32 1" >>confdefs.h
  
-@@ -3876,12 +3876,15 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
+@@ -3741,12 +3741,15 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
  		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
  		libmono_ldflags="-pthread"
  		need_link_unlink=yes
@@ -28,7 +31,7 @@ $NetBSD: patch-ab,v 1.1 2013/06/17 12:43:28 wiz Exp $
  		host_win32=no
  		if test "x$PTHREAD_CFLAGS" = "x"; then
  			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
-@@ -3897,7 +3900,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
+@@ -3762,7 +3765,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
  			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
  			libmono_ldflags="$PTHREAD_LIBS"
  		fi
@@ -38,7 +41,7 @@ $NetBSD: patch-ab,v 1.1 2013/06/17 12:43:28 wiz Exp $
  		need_link_unlink=yes
  
  $as_echo "#define PTHREAD_POINTER_ID 1" >>confdefs.h
-@@ -22821,7 +22825,7 @@ LIBC="libc.so.6"
+@@ -23481,7 +23485,7 @@ LIBC="libc.so.6"
  INTL="libc.so.6"
  SQLITE="libsqlite.so.0"
  SQLITE3="libsqlite3.so.0"
@@ -47,7 +50,19 @@ $NetBSD: patch-ab,v 1.1 2013/06/17 12:43:28 wiz Exp $
  
  sizeof_register="SIZEOF_VOID_P"
  
-@@ -23379,10 +23383,12 @@ case "$host" in
+@@ -23580,6 +23584,11 @@ rm -f core conftest.err conftest.$ac_obj
+ 		JIT_SUPPORTED=yes
+ 		jit_wanted=true
+ 		case $host_os in
++		  solaris*)
++			LIBC="libc.so"
++			INTL="libintl.so"
++			have_visibility_hidden=no
++			;;
+ 		  linux*)
+ 			sgen_supported=true
+ 			AOT_SUPPORTED="yes"
+@@ -24039,10 +24048,12 @@ case "$host" in
  	X11="libX11.dylib"
  	;;
       *-*-*netbsd*)
diff --git a/lang/mono2/patches/patch-da b/lang/mono2/patches/patch-da
index f59aaac85b7..dd1aab27b7b 100644
--- a/lang/mono2/patches/patch-da
+++ b/lang/mono2/patches/patch-da
@@ -1,8 +1,24 @@
-$NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
+$NetBSD: patch-da,v 1.2 2013/09/12 20:13:41 jperkin Exp $
 
---- libgc/include/private/gcconfig.h.orig	2011-04-18 07:23:28.000000000 -0400
-+++ libgc/include/private/gcconfig.h	2011-10-13 20:10:24.000000000 -0400
-@@ -361,6 +361,9 @@
+* Support DragonFlyBSD
+* Support 64-bit SunOS
+* Use mmap on NetBSD
+
+--- libgc/include/private/gcconfig.h.orig	2012-01-30 18:01:22.000000000 +0000
++++ libgc/include/private/gcconfig.h
+@@ -163,6 +163,11 @@
+ #    define SUNOS5
+ #    define mach_type_known
+ # endif
++# if defined(sun) && defined(__amd64)
++#    define X86_64
++#    define SUNOS5
++#    define mach_type_known
++# endif
+ # if (defined(__OS2__) || defined(__EMX__)) && defined(__32BIT__)
+ #    define I386
+ #    define OS2
+@@ -361,6 +366,9 @@
  #   define OPENBSD
  #   define mach_type_known
  # endif
@@ -12,7 +28,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  # if defined(FREEBSD) && (defined(i386) || defined(__i386__))
  #   define I386
  #   define mach_type_known
-@@ -700,6 +703,10 @@
+@@ -700,6 +708,10 @@
  #   endif
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
@@ -23,7 +39,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #	define HEURISTIC2
  #	ifdef __ELF__
  #	  define DATASTART GC_data_start
-@@ -891,6 +898,10 @@
+@@ -891,6 +903,10 @@
  #   ifdef NETBSD
  #     define ALIGNMENT 4
  #     define OS_TYPE "NETBSD"
@@ -34,7 +50,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #     define HEURISTIC2
        extern char etext[];
  #     define DATASTART GC_data_start
-@@ -1062,6 +1073,10 @@
+@@ -1062,6 +1078,10 @@
  #   endif
  #   ifdef NETBSD
  #     define OS_TYPE "NETBSD"
@@ -45,7 +61,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #     define HEURISTIC2
  #     ifdef __ELF__
  #	define DATASTART GC_data_start
-@@ -1374,6 +1389,10 @@
+@@ -1374,6 +1394,10 @@
  #   endif
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
@@ -56,7 +72,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #	ifdef __ELF__
  #	    define DYNAMIC_LOADING
  #	endif
-@@ -1534,6 +1553,10 @@
+@@ -1534,6 +1558,10 @@
  #   if defined(NETBSD)
  #     define ALIGNMENT 4
  #     define OS_TYPE "NETBSD"
@@ -67,7 +83,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #     define HEURISTIC2
  #     define USE_GENERIC_PUSH_REGS
  #     ifdef __ELF__
-@@ -1660,6 +1683,10 @@
+@@ -1660,6 +1688,10 @@
  #   endif
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
@@ -78,7 +94,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #	define HEURISTIC2
  #	define DATASTART GC_data_start
  #	define ELFCLASS32 32
-@@ -1923,6 +1950,10 @@
+@@ -1923,6 +1955,10 @@
  #   define ALIGNMENT 4
  #   ifdef NETBSD
  #       define OS_TYPE "NETBSD"
@@ -89,7 +105,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #       define HEURISTIC2
  #	ifdef __ELF__
  #          define DATASTART GC_data_start
-@@ -2020,6 +2051,10 @@
+@@ -2020,6 +2056,10 @@
  #   endif
  #   ifdef NETBSD
  #      define OS_TYPE "NETBSD"
@@ -100,7 +116,7 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #      define HEURISTIC2
  #      define DATASTART GC_data_start
  #       define USE_GENERIC_PUSH_REGS
-@@ -2131,6 +2166,10 @@
+@@ -2131,6 +2171,10 @@
  #   endif
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
@@ -111,3 +127,33 @@ $NetBSD: patch-da,v 1.1 2013/06/17 12:43:28 wiz Exp $
  #	ifdef __ELF__
  #	    define DYNAMIC_LOADING
  #	endif
+@@ -2138,6 +2182,29 @@
+ 	extern char etext[];
+ #	define SEARCH_FOR_DATA_START
+ #   endif
++#   ifdef SUNOS5
++#	define OS_TYPE "SUNOS5"
++#	define ELF_CLASS ELFCLASS64
++	extern int _etext[], _end[];
++	extern ptr_t GC_SysVGetDataStart();
++#	define DATASTART GC_SysVGetDataStart(0x1000, _etext)
++#	define DATAEND (_end)
++#	include <sys/vmparam.h>
++#	ifdef USERLIMIT
++#	    define STACKBOTTOM USRSTACK
++#	else
++#	    define HEURISTIC2
++#	endif
++#	define DYNAMIC_LOADING
++#	if !defined(USE_MMAP) && defined(REDIRECT_MALLOC)
++#	    define USE_MMAP
++#	endif
++#	ifdef USE_MMAP
++#	    define HEAP_START (ptr_t)0x40000000
++#	else
++#	    define HEAP_START DATAEND
++#	endif
++#   endif
+ #   ifdef OPENBSD
+ #       define OS_TYPE "OPENBSD"
+ #       define ELF_CLASS ELFCLASS64