cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.10.5

Browse Source
This commit is contained in:
robert 2011-08-29 10:53:22 +00:00
parent d7ceace5c0
commit a0cff325ef
3 changed files with 9 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/mono/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.62 2011/08/24 10:01:21 espie Exp $
# $OpenBSD: Makefile,v 1.63 2011/08/29 10:53:22 robert Exp $
COMMENT= cross platform, open source .NET developement framework
DISTNAME= mono-2.10.2
REVISION= 0
DISTNAME= mono-2.10.5
CATEGORIES= lang devel
@ -26,7 +25,8 @@ PERMIT_DISTFILES_CDROM= Yes
WANTLIB= c m pthread z stdc++
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/
MASTER_SITES= http://download.mono-project.com/sources/mono/ \
http://ftp.novell.com/pub/mono/sources/mono/
EXTRACT_SUFX= .tar.bz2
MODULES= lang/mono \

10
lang/mono/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mono-2.10.2.tar.bz2) = v/BX3D5WuIQbuxq+BThYuw==
RMD160 (mono-2.10.2.tar.bz2) = usHst+lMdzQa5fFfjVkUH560qjg=
SHA1 (mono-2.10.2.tar.bz2) = e2cyVcaxfFpBwVBZ5fBo1qlw0uo=
SHA256 (mono-2.10.2.tar.bz2) = lhRHKqEx5hvNvy/EirehI+pXoQ5zbe9RNqR4Rlr6BrQ=
SIZE (mono-2.10.2.tar.bz2) = 33737282
MD5 (mono-2.10.5.tar.bz2) = GVTxGTLoKyrjtksq6TRNkA==
RMD160 (mono-2.10.5.tar.bz2) = e72DrMGtGWei9P+tY386cnEb10w=
SHA1 (mono-2.10.5.tar.bz2) = aLmR6hcnpE0eak/7FhucouSO+Do=
SHA256 (mono-2.10.5.tar.bz2) = qAxkSGJUH0A/jVGjt8ccR7ZWdhSIRjnC2JDif6nvrxY=
SIZE (mono-2.10.5.tar.bz2) = 33940775

41
lang/mono/patches/patch-mono_mini_tramp-amd64_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-mono_mini_tramp-amd64_c,v 1.1 2011/06/04 11:17:08 robert Exp $
--- mono/mini/tramp-amd64.c.orig Fri Jun 3 16:43:37 2011
+++ mono/mini/tramp-amd64.c Fri Jun 3 16:43:42 2011
@@ -707,6 +707,7 @@ mono_arch_create_specific_trampoline (gpointer arg1, M
{
guint8 *code, *buf, *tramp;
int size;
+ gboolean far_addr = FALSE;
tramp = mono_get_trampoline_code (tramp_type);
@@ -717,6 +718,15 @@ mono_arch_create_specific_trampoline (gpointer arg1, M
size = 5 + 1 + 8;
code = buf = mono_domain_code_reserve_align (domain, size, 1);
+
+ if (((gint64)tramp - (gint64)code) >> 31 != 0 && ((gint64)tramp - (gint64)code) >> 31 != -1) {
+#ifndef MONO_ARCH_NOMAP32BIT
+ g_assert_not_reached ();
+#endif
+ far_addr = TRUE;
+ size += 16;
+ code = buf = mono_domain_code_reserve_align (domain, size, 1);
+ }
#elif defined(__native_client_codegen__)
size = 5 + 1 + 4;
/* Aligning the call site below could */
@@ -726,7 +736,12 @@ mono_arch_create_specific_trampoline (gpointer arg1, M
code = buf;
#endif
- amd64_call_code (code, tramp);
+ if (far_addr) {
+ amd64_mov_reg_imm (code, AMD64_R11, tramp);
+ amd64_call_reg (code, AMD64_R11);
+ } else {
+ amd64_call_code (code, tramp);
+ }
/* The trampoline code will obtain the argument from the instruction stream */
#if defined(__default_codegen__)
if ((((guint64)arg1) >> 32) == 0) {