/hg/icedtea6: JamVM: Compile interp using -marm to work on ARM T...

[xranby at icedtea.classpath.org]

changeset 0ca79255e13e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0ca79255e13e
author: Xerxes R?nby <xerxes at zafena.se>
date: Sun Mar 13 01:00:55 2011 +0100

	JamVM: Compile interp using -marm to work on ARM Thumb2 systems.

	2011-03-13 Xerxes Ranby <xerxes at zafena.se> Robert
	Loughter <rob at 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.


diffstat:

 ChangeLog                                  |   7 +++++++
 Makefile.am                                |   3 ++-
 patches/jamvm/arm-interp_cflags-marm.patch |  21 +++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletions(-)

diffs (53 lines):

diff -r e8aa96c463f3 -r 0ca79255e13e ChangeLog
--- a/ChangeLog	Fri Mar 11 16:33:50 2011 +0100
+++ b/ChangeLog	Sun Mar 13 01:00:55 2011 +0100
@@ -1,3 +1,10 @@
+2011-03-13  Xerxes Ranby  <xerxes at zafena.se>
+	    Robert Loughter  <rob at 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 at zafena.se>
 
 	JamVM: mips
diff -r e8aa96c463f3 -r 0ca79255e13e Makefile.am
--- a/Makefile.am	Fri Mar 11 16:33:50 2011 +0100
+++ b/Makefile.am	Sun Mar 13 01:00:55 2011 +0100
@@ -365,7 +365,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
diff -r e8aa96c463f3 -r 0ca79255e13e patches/jamvm/arm-interp_cflags-marm.patch
--- /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])