aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-02-18 00:06:46 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-02-21 12:33:11 +0100
commitc79fd9b1616499dcb44e1408399cdfe54f3ccfe2 (patch)
treea5922f52eeee1a75901d757332e6b988d825cab7 /recipes/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch
parent2fd114ae2977202ca2762f6ebb9be9c5d88072e2 (diff)
downloadopenembedded-c79fd9b1616499dcb44e1408399cdfe54f3ccfe2.tar.gz
openembedded-c79fd9b1616499dcb44e1408399cdfe54f3ccfe2.tar.bz2
openembedded-c79fd9b1616499dcb44e1408399cdfe54f3ccfe2.zip
openjdk: backport 1.11.1 release from meta-java
* shark is disabled since 1.11 * rework patches * rework inc files for jamvm * bump PR
Diffstat (limited to 'recipes/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch')
-rw-r--r--recipes/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch b/recipes/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch
new file mode 100644
index 0000000000..ec10e69486
--- /dev/null
+++ b/recipes/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch
@@ -0,0 +1,41 @@
+Index: openjdk/hotspot/make/linux/makefiles/zeroshark.make
+===================================================================
+--- openjdk/hotspot/make/linux/makefiles/zeroshark.make 2011-12-20 18:24:38.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2011-12-20 18:31:22.584884637 +0100
+@@ -32,13 +32,20 @@
+ Obj_Files += thumb2.o
+
+ CFLAGS += -DHOTSPOT_ASM
++CCFLAGS += -DHOTSPOT_ASM
++
++ifeq ($(CROSS_COMPILATION), true)
++ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD)
++else
++ C_COMPILE_FOR_MKBC = $(C_COMPILE)
++endif
+
+ cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
+ thumb2.o: offsets_arm.s
+
+ offsets_arm.s: mkoffsets
+ @echo Generating assembler offsets
+- ./mkoffsets > $@
++ $(QEMU) ./mkoffsets > $@
+
+ bytecodes_arm.s: bytecodes_arm.def mkbc
+ @echo Generatine ARM assembler bytecode sequences
+@@ -46,12 +53,12 @@
+
+ mkbc: $(GAMMADIR)/tools/mkbc.c
+ @echo Compiling mkbc tool
+- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
++ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE)
+
+ mkoffsets: asm_helper.cpp
+ @echo Compiling offset generator
+ $(QUIETLY) $(REMOVE_TARGET)
+- $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
++ $(CC_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+
+ endif
+