Accepting request 30632 from Mono:Factory

Copy from Mono:Factory/mono-core based on submit request 30632 from user ajorgensen

OBS-URL: https://build.opensuse.org/request/show/30632
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=35

mono-2.4.2.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae
-size 24815426

mono-2.6.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bd6cc59b740bb3a971a6315f3a85fdfdf5cf1e94545e915ba96c3ea7224baa3
+size 27644697

mono-core.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jan 26 22:30:50 UTC 2010 - ajorgensen@novell.com
+
+- Patch to fix AOT on Xen
+
+-------------------------------------------------------------------
+Tue Jan 26 20:51:03 UTC 2010 - ajorgensen@novell.com
+
+- Update to 2.6.1
+  * http://www.mono-project.com/Release_Notes_Mono_2.6.1
+
 -------------------------------------------------------------------
 Mon Aug 10 23:16:42 UTC 2009 - ajorgensen@novell.com
 

mono-core.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package mono-core (Version 2.4.2.3)
+# spec file for package mono-core (Version 2.6.1)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,14 +20,15 @@
 %{!?ext_man: %define ext_man .gz}
 
 Name:           mono-core
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Group:          Development/Languages/Mono
 Summary:        A .NET Runtime Environment
 Url:            http://go-mono.org/
-Version:        2.4.2.3
+Version:        2.6.1
 Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        mono-%{version}.tar.bz2
+Patch0:         xen-aot.patch
 ExclusiveArch:  %ix86 x86_64 ppc ppc64 hppa armv4l sparc s390 ia64 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       mono = %{version}-%{release}
@@ -52,10 +53,11 @@ Conflicts:      f-spot < 0.4
 Conflicts:      mono-addins < 0.3.1
 # Only use recommends for 11.0 and up
 %if 0%{?suse_version} >= 1100
-Recommends:     libgdiplus0 >= 2.4
+Recommends:     libgdiplus0 >= 2.6
 %else
-Requires:       libgdiplus0 >= 2.4
+Requires:       libgdiplus0 >= 2.6
 %endif
+BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel zlib-devel
 #######  distro specific changes  ########
 #####
@@ -154,7 +156,6 @@ Authors:
 %_bindir/mono-test-install
 %_bindir/mcs
 %_bindir/mcs1
-%_bindir/smcs
 %_bindir/mozroots
 %_bindir/setreg
 %_bindir/sn
@@ -181,7 +182,6 @@ Authors:
 %_prefix/lib/mono/gac/Mono.CompilerServices.SymbolWriter
 %_prefix/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll
 %_prefix/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll
-%_prefix/lib/mono/2.1/Mono.CompilerServices.SymbolWriter.dll
 %_prefix/lib/mono/gac/Mono.GetOptions
 %_prefix/lib/mono/1.0/Mono.GetOptions.dll
 %_prefix/lib/mono/2.0/Mono.GetOptions.dll
@@ -189,6 +189,8 @@ Authors:
 %_prefix/lib/mono/2.0/Mono.Simd.dll
 %_prefix/lib/mono/gac/Mono.Management
 %_prefix/lib/mono/2.0/Mono.Management.dll
+%_prefix/lib/mono/gac/Mono.Tasklets
+%_prefix/lib/mono/2.0/Mono.Tasklets.dll
 %_prefix/lib/mono/gac/Mono.Security
 %_prefix/lib/mono/1.0/Mono.Security.dll
 %_prefix/lib/mono/2.0/Mono.Security.dll
@@ -198,27 +200,21 @@ Authors:
 %_prefix/lib/mono/gac/System.Xml
 %_prefix/lib/mono/1.0/System.Xml.dll
 %_prefix/lib/mono/2.0/System.Xml.dll
-%_prefix/lib/mono/2.1/System.Xml.dll
 %_prefix/lib/mono/gac/System.Xml.Linq
 %_prefix/lib/mono/2.0/System.Xml.Linq.dll
-%_prefix/lib/mono/2.1/System.Xml.Linq.dll
 %_prefix/lib/mono/gac/System
 %_prefix/lib/mono/1.0/System.dll
 %_prefix/lib/mono/2.0/System.dll
-%_prefix/lib/mono/2.1/System.dll
 %_prefix/lib/mono/gac/System.Configuration
 %_prefix/lib/mono/2.0/System.Configuration.dll
 %_prefix/lib/mono/1.0/mscorlib.dll*
 %_prefix/lib/mono/2.0/mscorlib.dll*
-%_prefix/lib/mono/2.1/mscorlib.dll*
-%_prefix/lib/mono/2.1/smcs.exe*
 %dir %_sysconfdir/mono
 %dir %_sysconfdir/mono/1.0
 %dir %_sysconfdir/mono/2.0
 %dir %_prefix/lib/mono
 %dir %_prefix/lib/mono/1.0
 %dir %_prefix/lib/mono/2.0
-%dir %_prefix/lib/mono/2.1
 %dir %_prefix/lib/mono/3.5
 %dir %_prefix/lib/mono/gac
 %config %_sysconfdir/mono/config
@@ -258,17 +254,12 @@ Authors:
 %_prefix/lib/mono/2.0/OpenSystem.C.dll
 %_prefix/lib/mono/gac/System.Core
 %_prefix/lib/mono/2.0/System.Core.dll
-%_prefix/lib/mono/2.1/System.Core.dll
-%_prefix/lib/mono/gac/System.Net
-%_prefix/lib/mono/2.1/System.Net.dll
 %_prefix/lib/mono/gac/Mono.CSharp
 %_prefix/lib/mono/2.0/Mono.CSharp.dll
 %_prefix/lib/mono/gac/Mono.Cecil
 %_prefix/lib/mono/gac/Mono.Cecil.Mdb
 # localizations?
 #%_datadir/locale/*/LC_MESSAGES/mcs.mo
-# Not sure if autobuild allows this...
-%_libdir/pkgconfig/smcs.pc
 
 %post
 /sbin/ldconfig
@@ -282,7 +273,7 @@ fi
 %postun -p /sbin/ldconfig
 
 %package -n mono-jscript
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        JScript .NET support for Mono
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -309,7 +300,7 @@ Authors:
 %_prefix/lib/mono/2.0/Microsoft.JScript.dll
 
 %package -n mono-locale-extras
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Extra locale information
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -347,7 +338,7 @@ Authors:
 %_prefix/lib/mono/2.0/I18N.Other.dll
 
 %package -n mono-data
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Database connectivity for Mono
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -377,7 +368,9 @@ Authors:
 
 %files -n mono-data
 %defattr(-, root, root)
+%_prefix/lib/mono/2.0/sqlmetal.exe*
 %_prefix/lib/mono/2.0/sqlsharp.exe*
+%_bindir/sqlmetal
 %_bindir/sqlsharp
 %_mandir/man1/sqlsharp.1%ext_man
 %_prefix/lib/mono/gac/System.Data
@@ -385,6 +378,7 @@ Authors:
 %_prefix/lib/mono/2.0/System.Data.dll
 %_prefix/lib/mono/gac/System.Data.Linq
 %_prefix/lib/mono/2.0/System.Data.Linq.dll
+%_prefix/lib/mono/gac/System.Data.Services
 %_prefix/lib/mono/gac/Mono.Data
 %_prefix/lib/mono/1.0/Mono.Data.dll
 %_prefix/lib/mono/2.0/Mono.Data.dll
@@ -409,7 +403,7 @@ Authors:
 %_prefix/lib/mono/2.0/System.Data.DataSetExtensions.dll
 
 %package -n mono-winforms
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Mono's Windows Forms implementation
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -453,7 +447,7 @@ Authors:
 %_prefix/lib/mono/gac/Mono.WebBrowser
 
 %package -n ibm-data-db2
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Database connectivity for DB2
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -482,7 +476,7 @@ Authors:
 %_prefix/lib/mono/2.0/IBM.Data.DB2.dll
 
 %package -n mono-extras
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Extra packages
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -511,6 +505,8 @@ Authors:
 %_mandir/man1/mono-service.1%ext_man
 %_bindir/mono-service
 %_bindir/mono-service2
+%_prefix/lib/mono/1.0/installutil.exe*
+%_prefix/lib/mono/2.0/installutil.exe*
 # These are errors because they should be symlinks, but they are copies, so rpmlint detects duplicate files
 %_prefix/lib/mono/gac/mono-service
 %_prefix/lib/mono/1.0/mono-service.exe*
@@ -541,7 +537,7 @@ Authors:
 %_prefix/lib/mono/2.0/Microsoft.Vsa.dll
 
 %package -n mono-data-sqlite
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Database connectivity for Mono
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -576,7 +572,7 @@ Authors:
 %_prefix/lib/mono/2.0/Mono.Data.Sqlite.dll
 
 %package -n mono-data-sybase
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Database connectivity for Mono
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -631,21 +627,49 @@ Authors:
 
 %files -n mono-wcf
 %defattr(-, root, root)
+%_bindir/svcutil
 %_prefix/lib/mono/gac/System.IdentityModel
 %_prefix/lib/mono/2.0/System.IdentityModel.dll
 %_prefix/lib/mono/gac/System.IdentityModel.Selectors
 %_prefix/lib/mono/2.0/System.IdentityModel.Selectors.dll
 %_prefix/lib/mono/gac/System.Runtime.Serialization
 %_prefix/lib/mono/2.0/System.Runtime.Serialization.dll
-%_prefix/lib/mono/2.1/System.Runtime.Serialization.dll
 %_prefix/lib/mono/gac/System.ServiceModel
 %_prefix/lib/mono/2.0/System.ServiceModel.dll
-%_prefix/lib/mono/2.1/System.ServiceModel.dll
 %_prefix/lib/mono/gac/System.ServiceModel.Web
 %_prefix/lib/mono/2.0/System.ServiceModel.Web.dll
-%_prefix/lib/mono/2.1/System.ServiceModel.Web.dll
+%_prefix/lib/mono/2.0/svcutil.exe*
 %_libdir/pkgconfig/wcf.pc
 
+%package -n mono-winfxcore
+License:        MIT License (or similar) ; Ms-Pl
+Summary:        Mono implementation of core WinFX APIs
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+
+%description -n mono-winfxcore
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Mono implementation of core WinFX APIs
+
+
+
+Authors:
+--------
+Miguel de Icaza <miguel@ximian.com>
+Paolo Molaro <lupus@ximian.com>
+Dietmar Maurer <dietmar@ximian.com>
+
+
+%files -n mono-winfxcore
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/WindowsBase
+%_prefix/lib/mono/2.0/WindowsBase.dll*
+
 %package -n mono-web
 License:        MIT License (or similar) ; Ms-Pl
 Summary:        Mono implementation of ASP.NET, Remoting and Web Services
@@ -715,6 +739,7 @@ Authors:
 %_libdir/pkgconfig/mono.web.pc
 %_libdir/pkgconfig/system.web.extensions_1.0.pc
 %_libdir/pkgconfig/system.web.extensions.design_1.0.pc
+%_libdir/pkgconfig/system.web.mvc.pc
 # exes
 %_prefix/lib/mono/1.0/disco.exe*
 %_prefix/lib/mono/1.0/soapsuds.exe*
@@ -747,7 +772,7 @@ Authors:
 %config %_sysconfdir/mono/2.0/Browsers
 
 %package -n mono-data-oracle
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Database connectivity for Mono
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -777,7 +802,7 @@ Authors:
 %_prefix/lib/mono/2.0/System.Data.OracleClient.dll
 
 %package -n mono-data-postgresql
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Database connectivity for Mono
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -807,7 +832,7 @@ Authors:
 %_prefix/lib/mono/2.0/Npgsql.dll
 
 %package -n bytefx-data-mysql
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Database connectivity for Mono
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -837,13 +862,13 @@ Authors:
 %_prefix/lib/mono/2.0/ByteFX.Data.dll
 
 %package -n mono-nunit
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        NUnit Testing Framework
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 
 %package -n mono-data-firebird
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Database connectivity for Mono
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -915,15 +940,22 @@ Authors:
 %_libdir/pkgconfig/mono-nunit.pc
 
 %package -n mono-devel
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        Mono development tools
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Requires:       glib2-devel
+# Required because they are referenced by .pc files
+Requires:       mono-data == %version-%release
+Requires:       mono-data-oracle == %version-%release
+Requires:       mono-extras == %version-%release
+Requires:       mono-jscript == %version-%release
+Requires:       mono-web == %version-%release
+Requires:       mono-winforms == %version-%release
 %if 0%{?monobuild}
 Requires:       libgdiplus0
 %else
-Requires:       libgdiplus0 >= 2.4
+Requires:       libgdiplus0 >= 2.6
 %endif
 # We build natively on ppc64 now
 %ifarch ppc64
@@ -957,7 +989,6 @@ Authors:
 # libs
 %_libdir/libmono.so
 %_libdir/libmono.a
-%_libdir/libmono.la
 # exes
 %_prefix/lib/mono/1.0/makecert.exe*
 %_prefix/lib/mono/2.0/mono-api-info.exe*
@@ -973,8 +1004,7 @@ Authors:
 %_prefix/lib/mono/1.0/ilasm.exe*
 %_prefix/lib/mono/2.0/ilasm.exe*
 %_prefix/lib/mono/1.0/installvst.exe*
-%_prefix/lib/mono/1.0/installutil.exe*
+%_prefix/lib/mono/2.0/lc.exe*
-%_prefix/lib/mono/2.0/installutil.exe*
 %_prefix/lib/mono/1.0/mkbundle.exe*
 %_prefix/lib/mono/2.0/mkbundle.exe*
 %_prefix/lib/mono/1.0/monop.exe*
@@ -989,7 +1019,8 @@ Authors:
 %_prefix/lib/mono/1.0/macpack.exe*
 %_prefix/lib/mono/2.0/mono-shlib-cop.exe*
 %_prefix/lib/mono/1.0/dtd2rng.exe*
-%_prefix/lib/mono/1.0/mono-xmltool.exe*
+%_prefix/lib/mono/2.0/mono-xmltool.exe*
+%_prefix/lib/mono/2.0/pdb2mdb.exe*
 # xbuild related files
 %_prefix/lib/mono/2.0/xbuild.exe*
 %_prefix/lib/mono/2.0/Microsoft.Build.xsd
@@ -999,6 +1030,7 @@ Authors:
 %_prefix/lib/mono/2.0/Microsoft.VisualBasic.targets
 %_prefix/lib/mono/2.0/MSBuild
 %_prefix/lib/mono/2.0/xbuild.rsp
+%_prefix/lib/mono/xbuild
 # man pages
 %_mandir/man1/cert2spc.1%ext_man
 %_mandir/man1/mono-cil-strip.1%ext_man
@@ -1006,6 +1038,7 @@ Authors:
 %_mandir/man1/genxs.1%ext_man
 %_mandir/man1/httpcfg.1%ext_man
 %_mandir/man1/ilasm.1%ext_man
+%_mandir/man1/lc.1%ext_man
 %_mandir/man1/macpack.1%ext_man
 %_mandir/man1/makecert.1%ext_man
 %_mandir/man1/mkbundle.1%ext_man
@@ -1013,6 +1046,7 @@ Authors:
 %_mandir/man1/monop.1%ext_man
 %_mandir/man1/mono-shlib-cop.1%ext_man
 %_mandir/man1/permview.1%ext_man
+%_mandir/man1/pdb2mdb.1%ext_man
 %_mandir/man1/prj2make.1%ext_man
 %_mandir/man1/secutil.1%ext_man
 %_mandir/man1/sgen.1%ext_man
@@ -1020,6 +1054,7 @@ Authors:
 %_mandir/man1/al.1%ext_man
 %_mandir/man1/mono-xmltool.1%ext_man
 %_mandir/man1/resgen.1%ext_man
+%_mandir/man1/xbuild.1%ext_man
 # Shell wrappers
 %_bindir/al
 %_bindir/al1
@@ -1035,11 +1070,13 @@ Authors:
 %_bindir/ilasm1
 %_bindir/ilasm2
 %_bindir/installvst
+%_bindir/lc
 %_bindir/macpack
 %_bindir/makecert
 %_bindir/mkbundle
 %_bindir/mkbundle1
 %_bindir/mkbundle2
+%_bindir/mono-gdb.py
 %_bindir/monodis
 %_bindir/monolinker
 %_bindir/monop
@@ -1051,6 +1088,7 @@ Authors:
 %_bindir/mono-find-requires
 %_bindir/mono-shlib-cop
 %_bindir/mono-xmltool
+%_bindir/pdb2mdb
 %_bindir/pedump
 %_bindir/permview
 %_bindir/prj2make
@@ -1064,16 +1102,24 @@ Authors:
 %_mandir/man1/monolinker.1%ext_man
 %_prefix/lib/mono/gac/PEAPI
 %_prefix/lib/mono/1.0/PEAPI.dll
-%_prefix/lib/mono/1.0/monolinker.*
+%_prefix/lib/mono/2.0/monolinker.*
 %_prefix/lib/mono/2.0/PEAPI.dll
+%_prefix/lib/mono/gac/Mono.Debugger.Soft
+%_prefix/lib/mono/2.0/Mono.Debugger.Soft.dll
 %_prefix/lib/mono/gac/Microsoft.Build.Tasks
 %_prefix/lib/mono/2.0/Microsoft.Build.Tasks.dll
+%_prefix/lib/mono/gac/Microsoft.Build.Tasks.v3.5
+%_prefix/lib/mono/3.5/Microsoft.Build.Tasks.v3.5.dll
 %_prefix/lib/mono/gac/Microsoft.Build.Framework
 %_prefix/lib/mono/2.0/Microsoft.Build.Framework.dll
+%_prefix/lib/mono/3.5/Microsoft.Build.Framework.dll
 %_prefix/lib/mono/gac/Microsoft.Build.Utilities
 %_prefix/lib/mono/2.0/Microsoft.Build.Utilities.dll
+%_prefix/lib/mono/gac/Microsoft.Build.Utilities.v3.5
+%_prefix/lib/mono/3.5/Microsoft.Build.Utilities.v3.5.dll
 %_prefix/lib/mono/gac/Microsoft.Build.Engine
 %_prefix/lib/mono/2.0/Microsoft.Build.Engine.dll
+%_prefix/lib/mono/3.5/Microsoft.Build.Engine.dll
 %_prefix/lib/mono-source-libs
 %_bindir/monograph
 %_prefix/include/mono-1.0
@@ -1096,32 +1142,14 @@ Authors:
 #  yet gzipped
 
 %package -n monodoc-core
-License:        LGPL v2.1 only
+License:        LGPLv2.1
-Summary:        Monodoc--A Documentation Browser Written in C#
+Summary:        Monodoc - Documentation tools for C# code
 Group:          Development/Tools/Other
-Url:            http://go-mono.org/
 Provides:       monodoc
 Obsoletes:      monodoc
 
 %description -n monodoc-core
-Monodoc is a documentation browser for the Mono project. It is written
+Monodoc-core contains documentation tools for C#.
-in C# using the GTK# libraries.
-
-
-
-Authors:
---------
-    Miguel de Icaza <miguel@ximian.com>
-    Duncan Mak <duncan@ximian.com>
-    Joshua Tauberer <tauberer@for.net>
-    Lee Malabone
-    Philip Van Hoof
-    Johannes Roith <johannes@jroith.de>
-    Alp Toker <alp@atoker.com>
-    Piers Haken
-    John Luke <jluke@cfl.rr.com>
-    Ben Maurer
-    Duncan Mak <duncan@ximian.com>
 
 %files -n monodoc-core
 %defattr(-, root, root)
@@ -1156,7 +1184,7 @@ Authors:
 %{_mandir}/man5/mdoc.5%ext_man
 
 %package -n mono-complete
-License:        LGPL v2.1 only
+License:        LGPLv2.1
 Summary:        A .NET Runtime Environment
 Group:          Development/Languages/Mono
 Requires:       bytefx-data-mysql = %version-%release
@@ -1201,6 +1229,7 @@ Authors:
 
 %prep
 %setup -q -n mono-%{version}
+%patch0
 
 %build
 # These are only needed if there are patches to the runtime
@@ -1213,12 +1242,13 @@ export CFLAGS=" $RPM_OPT_FLAGS -DKDE_ASSEMBLIES='\"/opt/kde3/%{_lib}\"' -fno-str
 %configure \
   --with-jit=yes \
   --with-ikvm=yes \
-  --with-moonlight=yes
+  --with-moonlight=no
 make
 
 %install
 make install DESTDIR=%buildroot
 # Remove unused files
+rm -f $RPM_BUILD_ROOT%_libdir/libmono.la
 rm $RPM_BUILD_ROOT%_libdir/libMonoPosixHelper.a
 rm $RPM_BUILD_ROOT%_libdir/libMonoPosixHelper.la
 rm -f $RPM_BUILD_ROOT%_libdir/libikvm-native.a

xen-aot.patch

@@ -0,0 +1,28 @@
+Index: mono/mini/mini-amd64.c
+===================================================================
+--- mono/mini/mini-amd64.c	(revision 149672)
++++ mono/mini/mini-amd64.c	(revision 149673)
+@@ -2558,11 +2558,6 @@
+ 			/* These methods are allocated using malloc */
+ 			near_call = FALSE;
+ 
+-		if (cfg->compile_aot) {
+-			near_call = TRUE;
+-			no_patch = TRUE;
+-		}
+-
+ #ifdef MONO_ARCH_NOMAP32BIT
+ 		near_call = FALSE;
+ #endif
+@@ -2571,6 +2566,11 @@
+ 		if (optimize_for_xen)
+ 			near_call = FALSE;
+ 
++		if (cfg->compile_aot) {
++			near_call = TRUE;
++			no_patch = TRUE;
++		}
++
+ 		if (near_call) {
+ 			/* 
+ 			 * Align the call displacement to an address divisible by 4 so it does