/hg/icedtea6: cppInterpreter_arm.S: Add .ltorg at end of the DIS...

[xranby at icedtea.classpath.org]

changeset c8c66c3cd97a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c8c66c3cd97a
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Dec 12 12:45:24 2011 +0100

	cppInterpreter_arm.S: Add .ltorg at end of the DISPATCH_FINISH macro
	to unbreak armv5 build-bots; .eabi_attribute Tag_ABI_* replaced by
	numerical values to stay compatible with GCC 4.3.3.

	2011-12-12 Xerxes Ranby <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.


diffstat:

 ChangeLog                                             |   8 ++++++++
 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |  17 +++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r 96ea1d0f5dc4 -r c8c66c3cd97a ChangeLog
--- a/ChangeLog	Thu Dec 08 15:39:55 2011 +0100
+++ b/ChangeLog	Mon Dec 12 12:45:24 2011 +0100
@@ -1,3 +1,11 @@
+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.
diff -r 96ea1d0f5dc4 -r c8c66c3cd97a arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Thu Dec 08 15:39:55 2011 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Mon Dec 12 12:45:24 2011 +0100
@@ -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