Add support for 64-bit SunOS.

6 files changed, 86 insertions, 24 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index abfbdf2ae31..f4c6ef27a99 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2013/08/18 09:42:31 jmcneill Exp $
+# $NetBSD: Makefile,v 1.142 2013/09/13 20:47:55 jperkin Exp $
 
 DISTNAME=	mono-3.0.10
 PKGREVISION=	2
@@ -137,8 +137,14 @@ PLIST_VARS=	monodoc
 CONFIGURE_ARGS+=	--with-mcs-docs=no
 CONFIGURE_ENV+=		ac_cv_func_getdomainname=no
 CONFIGURE_ENV+=		ac_cv_func_setdomainname=no
+.  if ${ABI} == "32"
 ULIMIT_CMD_datasize=	ulimit -d 262144
 ULIMIT_CMD_stacksize=	ulimit -s 10240
+.  else
+CONFIGURE_ARGS+=	--with-sigaltstack=no
+ULIMIT_CMD_datasize=	ulimit -d 524288
+ULIMIT_CMD_stacksize=	ulimit -s 10240
+.  endif
 .elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*}
 CONFIGURE_ARGS+=	--with-mcs-docs=no
 CONFIGURE_ARGS+=	--disable-parallel-mark
diff --git a/lang/mono/PLIST.SunOS b/lang/mono/PLIST.SunOS
deleted file mode 100644
index 39212c9f7a7..00000000000
--- a/lang/mono/PLIST.SunOS
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2013/06/06 19:05:45 jperkin Exp $
-bin/mono-sgen
-lib/libmonosgen-2.0.la
-lib/pkgconfig/monosgen-2.pc
diff --git a/lang/mono/PLIST.SunOS-i386 b/lang/mono/PLIST.SunOS-i386
new file mode 100644
index 00000000000..ccb1e7cb6a2
--- /dev/null
+++ b/lang/mono/PLIST.SunOS-i386
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.SunOS-i386,v 1.1 2013/09/13 20:47:55 jperkin Exp $
+bin/mono-sgen
+lib/libmonosgen-2.0.la
+lib/pkgconfig/monosgen-2.pc
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 9f2fdd4928d..45826857800 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.92 2013/08/18 09:42:31 jmcneill Exp $
+$NetBSD: distinfo,v 1.93 2013/09/13 20:47:55 jperkin Exp $
 
 SHA1 (mono-3.0.10.tar.bz2) = 7646d3ecb2dc2e7fd12c7fc661e7a500b9833e64
 RMD160 (mono-3.0.10.tar.bz2) = d2c4dc64b233f51f6ec8be4ee1f3ef08f0099057
 Size (mono-3.0.10.tar.bz2) = 81844036 bytes
 SHA1 (patch-aa) = 688e02cd43716476f3f1baae9116a6aa7e186b2b
-SHA1 (patch-ab) = 439b4362353e8409047f26d3ebde7f1eaebddfe3
+SHA1 (patch-ab) = 3cf020bef25e63a12bbd393f2a2d667dd1b2a86b
 SHA1 (patch-ac) = 9666a8e30aedacf46d4817161cc0036fa59b12d8
 SHA1 (patch-ad) = d990e10f91f108aa5f13e2479b3407636f7dd634
 SHA1 (patch-ae) = 6431e119a26f89c691c27858d64c8ccc7f8c0e31
@@ -28,7 +28,7 @@ SHA1 (patch-bg) = 019f20c4a916569a0ef31d4c44f87eaac26e253b
 SHA1 (patch-bh) = 82747732a771783d5368672810684eefba1a8ee3
 SHA1 (patch-bi) = 67e916a7cd93fc2e327f14beda1e75333d25daf2
 SHA1 (patch-cc) = 86cc1590c3f59d90fa24c58355712089c0e2adff
-SHA1 (patch-da) = 2861808ce53de77ca2ec2ae4c405cc578763578d
+SHA1 (patch-da) = 03c7edf29072de01b15ca97a3c074980c438b43c
 SHA1 (patch-db) = 515fdc97e5d70b5ecb2fdb6e4a1693df1b67f1a0
 SHA1 (patch-dc) = c3f7763d019226473b3b6b22d4ab2511b6a65fa4
 SHA1 (patch-de) = 7e74a64c6be7fe38fe870a1c56d13825500d421c
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index 0eac29eb0d8..983d1defc85 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.31 2013/08/18 09:42:31 jmcneill Exp $
+$NetBSD: patch-ab,v 1.32 2013/09/13 20:47:55 jperkin Exp $
 
 --- configure.orig	2013-04-25 09:08:54.000000000 +0000
 +++ configure
@@ -56,7 +56,19 @@ $NetBSD: patch-ab,v 1.31 2013/08/18 09:42:31 jmcneill Exp $
  
  sizeof_register="SIZEOF_VOID_P"
  
-@@ -24765,13 +24770,17 @@ fi
+@@ -24635,6 +24640,11 @@ $as_echo "#define __mono_ilp32__ 1" >>co
+ 			sizeof_register=8
+ 		fi
+ 		case $host_os in
++		  solaris*)
++			LIBC="libc.so"
++			INTL="libintl.so"
++			have_visibility_hidden=no
++			;;
+ 		  linux*)
+ 			sgen_supported=true
+ 			AOT_SUPPORTED="yes"
+@@ -24765,13 +24775,17 @@ fi
  	    NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6"
  		sgen_supported=true
  		;;
@@ -77,7 +89,7 @@ $NetBSD: patch-ab,v 1.31 2013/08/18 09:42:31 jmcneill Exp $
  		if test "x$cross_compiling" != "xno"; then
  		   # Provide sane defaults when cross-compiling
  		   CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__ -DHAVE_ARMV6=1"
-@@ -25132,10 +25141,12 @@ case "$host" in
+@@ -25132,10 +25146,12 @@ case "$host" in
  	X11="libX11.dylib"
  	;;
       *-*-*netbsd*)
@@ -93,7 +105,7 @@ $NetBSD: patch-ab,v 1.31 2013/08/18 09:42:31 jmcneill Exp $
      	LIBC="libc.so"
  	INTL="libintl.so"
  	SQLITE="libsqlite.so"
-@@ -26162,7 +26173,6 @@ else
+@@ -26162,7 +26178,6 @@ else
  fi
  
  
diff --git a/lang/mono/patches/patch-da b/lang/mono/patches/patch-da
index 804974e011e..a4313c13cb4 100644
--- a/lang/mono/patches/patch-da
+++ b/lang/mono/patches/patch-da
@@ -1,8 +1,22 @@
-$NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
+$NetBSD: patch-da,v 1.5 2013/09/13 20:47:55 jperkin Exp $
 
---- libgc/include/private/gcconfig.h.orig	2012-12-05 17:44:36.000000000 +0000
+Support 64-bit SunOS.
+
+--- libgc/include/private/gcconfig.h.orig	2013-04-25 09:01:57.000000000 +0000
 +++ libgc/include/private/gcconfig.h
-@@ -366,6 +366,9 @@
+@@ -169,6 +169,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
+@@ -372,6 +377,9 @@
  #   define OPENBSD
  #   define mach_type_known
  # endif
@@ -12,7 +26,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  # if defined(FREEBSD) && (defined(i386) || defined(__i386__))
  #   define I386
  #   define mach_type_known
-@@ -705,6 +708,10 @@
+@@ -711,6 +719,10 @@
  #   endif
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
@@ -23,7 +37,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #	define HEURISTIC2
  #	ifdef __ELF__
  #	  define DATASTART GC_data_start
-@@ -896,6 +903,10 @@
+@@ -902,6 +914,10 @@
  #   ifdef NETBSD
  #     define ALIGNMENT 4
  #     define OS_TYPE "NETBSD"
@@ -34,7 +48,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #     define HEURISTIC2
        extern char etext[];
  #     define DATASTART GC_data_start
-@@ -1067,6 +1078,10 @@
+@@ -1097,6 +1113,10 @@
  #   endif
  #   ifdef NETBSD
  #     define OS_TYPE "NETBSD"
@@ -45,7 +59,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #     define HEURISTIC2
  #     ifdef __ELF__
  #	define DATASTART GC_data_start
-@@ -1380,6 +1395,10 @@
+@@ -1383,6 +1403,10 @@
  #   endif
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
@@ -56,7 +70,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #	ifdef __ELF__
  #	    define DYNAMIC_LOADING
  #	endif
-@@ -1541,6 +1560,10 @@
+@@ -1544,6 +1568,10 @@
  #   if defined(NETBSD)
  #     define ALIGNMENT 4
  #     define OS_TYPE "NETBSD"
@@ -67,7 +81,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #     define HEURISTIC2
  #     define USE_GENERIC_PUSH_REGS
  #     ifdef __ELF__
-@@ -1667,6 +1690,10 @@
+@@ -1670,6 +1698,10 @@
  #   endif
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
@@ -78,7 +92,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #	define HEURISTIC2
  #	define DATASTART GC_data_start
  #	define ELFCLASS32 32
-@@ -1930,6 +1957,10 @@
+@@ -1937,6 +1969,10 @@
  #   define ALIGNMENT 4
  #   ifdef NETBSD
  #       define OS_TYPE "NETBSD"
@@ -89,7 +103,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #       define HEURISTIC2
  #	ifdef __ELF__
  #          define DATASTART GC_data_start
-@@ -2027,6 +2058,10 @@
+@@ -2034,6 +2070,10 @@
  #   endif
  #   ifdef NETBSD
  #      define OS_TYPE "NETBSD"
@@ -100,7 +114,7 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #      define HEURISTIC2
  #      define DATASTART GC_data_start
  #       define USE_GENERIC_PUSH_REGS
-@@ -2138,6 +2173,10 @@
+@@ -2145,6 +2185,10 @@
  #   endif
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
@@ -111,3 +125,33 @@ $NetBSD: patch-da,v 1.4 2013/05/29 11:11:12 wiz Exp $
  #	ifdef __ELF__
  #	    define DYNAMIC_LOADING
  #	endif
+@@ -2152,6 +2196,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