Mercurial > hg > release > icedtea7-2.0

changeset 2407:8a8ff2600f18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
JamVM: Compile interp using -marm to work on ARM Thumb2 systems. 2011-03-13 Xerxes Ranby <xerxes@zafena.se> Robert Loughter <rob@jamvm.org.uk> JamVM: Compile interp using -marm to work on ARM Thumb2 systems. * Makefile.am: Add new JamVM patch. * patches/jamvm/arm-interp_cflags-marm.patch: New patch.
author Xerxes R?nby <xerxes@zafena.se>
date Sun, 13 Mar 2011 01:00:55 +0100
parents 58b8da72031a
children 4caadf3a7f13
files ChangeLog Makefile.am patches/jamvm/arm-interp_cflags-marm.patch
diffstat 3 files changed, 31 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 20 00:16:49 2011 +0100
+++ b/ChangeLog	Sun Mar 13 01:00:55 2011 +0100
@@ -1,3 +1,10 @@
+2011-03-13  Xerxes Ranby  <xerxes@zafena.se>
+	    Robert Loughter  <rob@jamvm.org.uk>
+
+	JamVM: Compile interp using -marm to work on ARM Thumb2 systems.
+	* Makefile.am: Add new JamVM patch.
+	* patches/jamvm/arm-interp_cflags-marm.patch: New patch.
+
 2011-03-11  Xerxes Ranby  <xerxes@zafena.se>
 
 	JamVM: mips
--- a/Makefile.am	Fri May 20 00:16:49 2011 +0100
+++ b/Makefile.am	Sun Mar 13 01:00:55 2011 +0100
@@ -315,7 +315,8 @@
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
 	patches/jamvm/ignore-unknown-options.patch \
-	patches/jamvm/mips64el.patch
+	patches/jamvm/mips64el.patch \
+	patches/jamvm/arm-interp_cflags-marm.patch
 endif
 
 if ENABLE_PULSE_JAVA
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/arm-interp_cflags-marm.patch	Sun Mar 13 01:00:55 2011 +0100
@@ -0,0 +1,22 @@
+Index: jamvm/jamvm/configure.ac
+===================================================================
+--- jamvm.orig/jamvm/configure.ac	2011-03-11 15:15:57.000000000 +0100
++++ jamvm/jamvm/configure.ac	2011-03-11 15:16:56.000000000 +0100
+@@ -43,7 +43,7 @@
+ mips64el-*-linux*) host_cpu=mips host_os=linux ;;
+ x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
+ x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
+-arm*-*-linux*) host_cpu=arm host_os=linux ;;
++arm*-*-linux*) host_cpu=arm host_os=linux interp_cflags=-marm ;;
+ arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
+ arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
+ powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
+@@ -178,7 +178,7 @@
+ 
+         if test "$enable_int_inlining" != no; then
+             AC_DEFINE([INLINING],1,[interpreter inlining])
+-            interp_cflags=-fno-reorder-blocks 
++            interp_cflags="$interp_cflags -fno-reorder-blocks"
+ 
+             if test "$enable_runtime_reloc_checks" != no; then
+                 AC_DEFINE([RUNTIME_RELOC_CHECKS],1,[compute relocatability at runtime])