SHA256
1
0
forked from pool/mono-core

Accepting request 132072 from openSUSE:Factory:ARM

- use hammer approach for vfp instead

- add arch linux vfp patch

- use vfp on armv7

- fix arm build to not depend on the build host's /proc/cpuinfo

OBS-URL: https://build.opensuse.org/request/show/132072
OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=78
This commit is contained in:
Ismail Dönmez 2012-09-01 22:23:38 +00:00 committed by Git OBS Bridge
parent 95b2933428
commit fd64094285
5 changed files with 88 additions and 0 deletions

14
mono-arm-cpuinfo-v5.patch Normal file
View File

@ -0,0 +1,14 @@
Index: mono-2.10.6/mono/mini/mini-arm.c
===================================================================
--- mono-2.10.6.orig/mono/mini/mini-arm.c
+++ mono-2.10.6/mono/mini/mini-arm.c
@@ -592,6 +592,9 @@ mono_arch_cpu_optimizazions (guint32 *ex
v5_supported = TRUE;
darwin = TRUE;
iphone_abi = TRUE;
+#elif 1
+ thumb_supported = TRUE;
+ v5_supported = TRUE;
#else
char buf [512];
char *line;

16
mono-arm-cpuinfo-v7.patch Normal file
View File

@ -0,0 +1,16 @@
Index: mono-2.10.6/mono/mini/mini-arm.c
===================================================================
--- mono-2.10.6.orig/mono/mini/mini-arm.c
+++ mono-2.10.6/mono/mini/mini-arm.c
@@ -592,6 +592,11 @@ mono_arch_cpu_optimizazions (guint32 *ex
v5_supported = TRUE;
darwin = TRUE;
iphone_abi = TRUE;
+#elif 1
+ thumb_supported = TRUE;
+ v5_supported = TRUE;
+ v6_supported = TRUE;
+ v7_supported = TRUE;
#else
char buf [512];
char *line;

22
mono-arm-vfp.patch Normal file
View File

@ -0,0 +1,22 @@
Index: mono-2.10.6/configure
===================================================================
--- mono-2.10.6.orig/configure
+++ mono-2.10.6/configure
@@ -23729,11 +23729,12 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- fpu=FPA
-else
- fpu=NONE
-fi
+#if ac_fn_c_try_compile "$LINENO"; then :
+# fpu=FPA
+#else
+# fpu=NONE
+#fi
+fpu=VFP
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fpu" >&5

View File

@ -3,6 +3,26 @@ Sat Jul 21 23:08:36 UTC 2012 - dvaleev@suse.com
- fix ppc build
-------------------------------------------------------------------
Fri Dec 2 13:31:57 UTC 2011 - agraf@suse.de
- use hammer approach for vfp instead
-------------------------------------------------------------------
Sun Nov 27 21:17:24 UTC 2011 - agraf@suse.de
- add arch linux vfp patch
-------------------------------------------------------------------
Sun Nov 27 16:36:08 UTC 2011 - agraf@suse.de
- use vfp on armv7
-------------------------------------------------------------------
Sun Nov 27 03:01:37 UTC 2011 - agraf@suse.de
- fix arm build to not depend on the build host's /proc/cpuinfo
-------------------------------------------------------------------
Fri Oct 7 14:47:35 CEST 2011 - dmueller@suse.de

View File

@ -33,6 +33,9 @@ Url: http://www.mono-project.com
Version: 2.10.6
Release: 0
Source0: mono-%{version}.tar.bz2
Patch1: mono-arm-cpuinfo-v5.patch
Patch2: mono-arm-cpuinfo-v7.patch
Patch3: mono-arm-vfp.patch
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -99,12 +102,25 @@ technologies that have been submitted to the ECMA for standardization.
%prep
%setup -q -n mono-%{version}
%ifarch armv5el
%patch1 -p1
%endif
%ifarch armv7l armv7hl
%patch2 -p1
%patch3 -p1
%endif
%build
# These are only needed if there are patches to the runtime
#rm -f libgc/libtool.m4
#autoreconf --force --install
#autoreconf --force --install libgc
%ifarch armv7l armv7hl
export MONO_CPU_ARCH="armv7l-thumb"
%endif
%ifarch armv5el
export MONO_CPU_ARCH="armv5el"
%endif
export CFLAGS=" $RPM_OPT_FLAGS -fno-strict-aliasing"
# distro specific configure options
%if %llvm == yes