summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2015-10-16 19:29:38 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-10-19 10:12:53 -0200
commit2dcff5266a6c1ed39e49b24b8d2984a165ad9c35 (patch)
tree86757e1611e29bc17a3decf678f2c5e25c2ed0a6 /recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
parenta73939323984fca1e919d3408d3301ccdbceac9c (diff)
downloadmeta-java-2dcff5266a6c1ed39e49b24b8d2984a165ad9c35.tar.gz
openjdk-6: remove
Since OpenJDK-6 is not maintained anymore, it's more reasonable to move to OpenJDK-8 instead of sticking at unmaintained, upstream not supported VM version. Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch')
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
deleted file mode 100644
index f14deaf..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
2index c2a1484..f460d85 100644
3--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
4+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
5@@ -32,13 +32,20 @@ Obj_Files += cppInterpreter_arm.o
6 Obj_Files += thumb2.o
7
8 CFLAGS += -DHOTSPOT_ASM
9+CCFLAGS += -DHOTSPOT_ASM
10+
11+ifeq ($(CROSS_COMPILATION), true)
12+ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD)
13+else
14+ C_COMPILE_FOR_MKBC = $(C_COMPILE)
15+endif
16
17 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
18 thumb2.o: offsets_arm.s
19
20 offsets_arm.s: mkoffsets
21 @echo Generating assembler offsets
22- ./mkoffsets > $@
23+ $(QEMU) ./mkoffsets > $@
24
25 bytecodes_arm.s: bytecodes_arm.def mkbc
26 @echo Generating ARM assembler bytecode sequences
27@@ -46,12 +53,12 @@ bytecodes_arm.s: bytecodes_arm.def mkbc
28
29 mkbc: $(GAMMADIR)/tools/mkbc.c
30 @echo Compiling mkbc tool
31- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
32+ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE)
33
34 mkoffsets: asm_helper.cpp
35 @echo Compiling offset generator
36 $(QUIETLY) $(REMOVE_TARGET)
37- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
38+ $(CC_COMPILE) $(CFLAGS) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
39
40 endif
41