Mercurial > hg > release > icedtea6-1.12
changeset 2724:2f08a6fa2940
merge
| author | aph |
|---|---|
| date | Fri, 28 Oct 2011 09:49:25 -0400 |
| parents | 10f799f0520c (current diff) 16a1f3497b7e (diff) |
| children | c2cf91b8ce35 |
| files | ChangeLog |
| diffstat | 5 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Oct 28 09:43:24 2011 -0400 +++ b/ChangeLog Fri Oct 28 09:49:25 2011 -0400 @@ -2,6 +2,14 @@ * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-debug.patch. +2011-10-27 Andrew Haley <aph@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. + 2011-10-26 Andrew Haley <aph@redhat.com> * patches/arm.patch (CFLAGS): Enable the ARM assembler port.
--- a/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Fri Oct 28 09:43:24 2011 -0400 +++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Fri Oct 28 09:49:25 2011 -0400 @@ -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__
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Oct 28 09:43:24 2011 -0400 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Oct 28 09:49:25 2011 -0400 @@ -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__
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Oct 28 09:43:24 2011 -0400 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Oct 28 09:49:25 2011 -0400 @@ -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__
--- a/patches/arm.patch Fri Oct 28 09:43:24 2011 -0400 +++ b/patches/arm.patch Fri Oct 28 09:49:25 2011 -0400 @@ -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