/hg/release/icedtea6-1.11: Disable T2-JIT on unsupported targets...

[xranby at icedtea.classpath.org]

changeset aa81d0648c82 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=aa81d0648c82
author: Xerxes Ranby <xerxes at zafena.se>
date: Thu Jan 19 17:41:09 2012 +0100

	Disable T2-JIT on unsupported targets like armv5.

	2012-01-19 Xerxes Ranby <xerxes at zafena.se> Andrew
	Haley <aph at redhat.com>

	 * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
	(Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5.


diffstat:

 ChangeLog                                   |  6 ++++++
 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp |  3 +++
 2 files changed, 9 insertions(+), 0 deletions(-)

diffs (26 lines):

diff -r 8c63d311e066 -r aa81d0648c82 ChangeLog
--- a/ChangeLog	Thu Jan 19 07:16:03 2012 -0500
+++ b/ChangeLog	Thu Jan 19 17:41:09 2012 +0100
@@ -1,3 +1,9 @@
+2012-01-19  Xerxes RÃ¥nby  <xerxes at zafena.se>
+	    Andrew Haley  <aph at redhat.com>
+
+	* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
+	(Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5.
+
 2012-01-19  Andrew Haley  <aph at redhat.com>
 
 	* openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp
diff -r 8c63d311e066 -r aa81d0648c82 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Thu Jan 19 07:16:03 2012 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Thu Jan 19 17:41:09 2012 +0100
@@ -7059,6 +7059,9 @@
   Thumb2_Entrypoint thumb_entry;
   int compiled_accessor;
 
+  if (!(CPUInfo & ARCH_THUMBEE))
+	UseCompiler = false;
+
   if (!UseCompiler || method->is_not_compilable()) {
 	ic->set(ic->state(), 1);
 	bc->set(ic->state(), 1);