/hg/icedtea6: 2 new changesets

[aph at icedtea.classpath.org]

changeset e07f3143b2ca in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e07f3143b2ca
author: aph
date: Mon Dec 12 12:42:26 2011 -0500

	Use !UseCompiler instead of DisableCompiler. 2011-12-12 Andrew
	Haley <aph at redhat.com>

	 * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
	(DisableCompiler): Delete. (Thumb2_Compile): Use
	!UseCompiler instead of DisableCompiler.
	(Thumb2_Initialize): Likewise.


changeset d6cf8b242032 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d6cf8b242032
author: aph
date: Mon Dec 12 12:46:59 2011 -0500

	merge


diffstat:

 ChangeLog                                             |  18 ++++++++++++++++++
 Makefile.am                                           |   2 +-
 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |  17 +++++++++--------
 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp           |  13 ++++++-------
 4 files changed, 34 insertions(+), 16 deletions(-)

diffs (129 lines):

diff -r db64ac99a1ee -r d6cf8b242032 ChangeLog
--- a/ChangeLog	Thu Dec 08 13:51:11 2011 +0000
+++ b/ChangeLog	Mon Dec 12 12:46:59 2011 -0500
@@ -1,3 +1,21 @@
+2011-12-12  Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (DisableCompiler): Delete.
+	(Thumb2_Compile): Use !UseCompiler instead of DisableCompiler.
+	(Thumb2_Initialize): Likewise.
+
+2011-12-12  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+	(DISPATCH_FINISH): Add .ltorg at end of the macro to unbreak
+	armv5 build-bots.
+	(.eabi_attribute Tag_ABI_*): Replaced by numerical values
+	to stay compatible with GCC 4.3.3.
+
+2011-12-08  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (JTREG_SRCS): Use abs_top_srcdir.
+
 2011-12-08  Andrew Haley  <aph at redhat.com>
 
 	* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
diff -r db64ac99a1ee -r d6cf8b242032 Makefile.am
--- a/Makefile.am	Thu Dec 08 13:51:11 2011 +0000
+++ b/Makefile.am	Mon Dec 12 12:46:59 2011 -0500
@@ -193,7 +193,7 @@
 # Sources list
 
 REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
-JTREG_SRCS = $(top_srcdir)/jtreg
+JTREG_SRCS = $(abs_top_srcdir)/jtreg
 
 # Patch list
 
diff -r db64ac99a1ee -r d6cf8b242032 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Thu Dec 08 13:51:11 2011 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Mon Dec 12 12:46:59 2011 -0500
@@ -506,6 +506,7 @@
         bic     ip, ip, #7
         ldr     pc, [ip, r1, lsl #2]
 	.set	dispatch_state, 0
+	.ltorg
 	.endm
 
 	.macro	DISPATCH_BYTECODE
@@ -625,14 +626,14 @@
 	.endif
 	.endm
 	
-	.eabi_attribute Tag_ABI_FP_denormal, 1
-	.eabi_attribute Tag_ABI_FP_exceptions, 1
-	.eabi_attribute Tag_ABI_FP_number_model, 3
-	.eabi_attribute Tag_ABI_align8_needed, 1
-	.eabi_attribute Tag_ABI_align8_preserved, 1
-	.eabi_attribute Tag_ABI_enum_size, 2
-	.eabi_attribute Tag_ABI_optimization_goals, 2
-	.eabi_attribute Tag_ABI_PCS_wchar_t, 4
+	.eabi_attribute 20, 1 @ Tag_ABI_FP_denormal
+	.eabi_attribute 21, 1 @ Tag_ABI_FP_exceptions
+	.eabi_attribute 23, 3 @ Tag_ABI_FP_number_model
+	.eabi_attribute 24, 1 @ Tag_ABI_align8_needed
+	.eabi_attribute 25, 1 @ Tag_ABI_align8_preserved
+	.eabi_attribute 26, 2 @ Tag_ABI_enum_size
+	.eabi_attribute 30, 2 @ Tag_ABI_optimization_goals
+	.eabi_attribute 18, 4 @ Tag_ABI_PCS_wchar_t
 
 	.text
 
diff -r db64ac99a1ee -r d6cf8b242032 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Thu Dec 08 13:51:11 2011 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Mon Dec 12 12:46:59 2011 -0500
@@ -6905,7 +6905,6 @@
 #endif
 
 extern unsigned CPUInfo;
-static int DisableCompiler = 0;
 
 extern "C" unsigned long long Thumb2_Compile(JavaThread *thread, unsigned branch_pc)
 {
@@ -6934,7 +6933,7 @@
   Thumb2_Entrypoint thumb_entry;
   int compiled_accessor;
 
-  if (DisableCompiler || method->is_not_compilable()) {
+  if (!UseCompiler || method->is_not_compilable()) {
 	ic->set(ic->state(), 1);
 	bc->set(ic->state(), 1);
 	return 0;
@@ -6991,7 +6990,7 @@
     if (rc == COMPILER_RESULT_FAILED)
         method->set_not_compilable();
     if (rc == COMPILER_RESULT_FATAL)
-	DisableCompiler = 1;
+	UseCompiler = false;
     compiling = 0;
     return 0;
   }
@@ -7242,8 +7241,8 @@
   u32 loc_irem, loc_idiv, loc_ldiv;
   int rc;
 
-  if (!(CPUInfo & ARCH_THUMBEE) || !UseCompiler) {
-    DisableCompiler = 1;
+  if (!(CPUInfo & ARCH_THUMBEE)) {
+    UseCompiler = false;
     return;
   }
 
@@ -7262,7 +7261,7 @@
 
   cb = (Thumb2_CodeBuf *)mmap(0, THUMB2_CODEBUF_SIZE, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
   if (cb == MAP_FAILED) {
-    DisableCompiler = 1;
+    UseCompiler = false;
     return;
   }
 
@@ -7275,7 +7274,7 @@
   codebuf.limit = (unsigned short *)cb->sp - (unsigned short *)cb->hp;
 
   if (rc = setjmp(compiler_error_env)) {
-    DisableCompiler = 1;
+    UseCompiler = false;
     return;
   }