Fix the non-ARM zero build

[Andrew Haley]

The big ARM patch broke non-ARM zero builds.

Fixed (well, kludged, TBH) thusly.  I'll think of a better fix later.

Andrew.



2011-10-27  Andrew Haley  <aph at redhat.com>

        * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (whole file):
        Conditionalize on #ifdef __arm__.
        * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Likewise.
        * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
        * patches/arm.patch: Move %.S rule outside ARM conditional.

diff -r 628e5ee78eca arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp	Thu Oct 27 13:54:50 2011 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp	Thu Oct 27 18:30:44 2011 +0100
@@ -16,6 +16,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */

+#ifdef __arm__
+
 #define	ARCH_THUMBEE	(1<<16)
 #define ARCH_VFP	(1<<17)
 #define ARCH_CLZ	(1<<18)
@@ -608,3 +610,5 @@
 }

 #endif // STATIC_OFFSETS
+
+#endif // __arm__
diff -r 628e5ee78eca arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Thu Oct 27 13:54:50 2011 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Thu Oct 27 18:30:44 2011 +0100
@@ -1,3 +1,5 @@
+#ifdef __arm__
+
 @ Copyright 2009, 2010 Edward Nevill
 @ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 @
@@ -6681,3 +6683,5 @@
 	.word	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	.word	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 #endif
+
+#endif // __arm__
diff -r 628e5ee78eca arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Thu Oct 27 13:54:50 2011 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Thu Oct 27 18:30:44 2011 +0100
@@ -16,6 +16,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */

+#ifdef __arm__
+
 #undef THUMB2EE
 #if !defined(DISABLE_THUMB2) && defined(HOTSPOT_ASM) && !defined(SHARK)
 #define THUMB2EE
@@ -7535,3 +7537,5 @@
 }

 #endif // THUMB2EE
+
+#endif // __arm__
diff -r 628e5ee78eca patches/arm.patch
--- a/patches/arm.patch	Thu Oct 27 13:54:50 2011 +0100
+++ b/patches/arm.patch	Thu Oct 27 18:30:44 2011 +0100
@@ -13,11 +13,6 @@
 +
 +CFLAGS += -DHOTSPOT_ASM
 +
-+%.o: %.S
-+	@echo Assembling $<
-+	$(QUIETLY) $(REMOVE_TARGET)
-+	$(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
-+
 +cppInterpreter_arm.o:	offsets_arm.s bytecodes_arm.s
 +thumb2.o:		offsets_arm.s
 +
@@ -40,6 +35,11 @@
 +
 +endif
 +
++%.o: %.S
++	@echo Assembling $<
++	$(QUIETLY) $(REMOVE_TARGET)
++	$(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
++
  # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
  OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
  # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized