summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2015-10-28 13:07:19 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2015-10-28 10:17:57 -0200
commited95222b71cc58f6039bdf944b0e11ce00fb0bf5 (patch)
tree332588676d80a2fbc276c9a0691d74f96a5a0ea0 /recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch
parentd3b7aaba7df3ef623e1441470abaf29e200d5cfd (diff)
downloadmeta-java-ed95222b71cc58f6039bdf944b0e11ce00fb0bf5.tar.gz
openjdk-7: update to IcedTea 2.6.2 OpenJDK 7u91b01
IcedTea 2.6.2 provides OpenJDK 7u91, which adds the October 2015 security updates. For more details see: http://blog.fuseyism.com/index.php/2015/10/23/security-icedtea-2-6-2-for-openjdk-7-released/ Furthermore the patches directory for OpenJDK-7 was renamed to avoid the version number. This makes it easier for upgrades and to see diff's between patches. Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch
new file mode 100644
index 0000000..e97e4fc
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch
@@ -0,0 +1,36 @@
1diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
2index c2a1484..156bdd0 100644
3--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
4+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
5@@ -33,26 +33,27 @@
6 Obj_Files += arm32JIT.o
7
8 CFLAGS += -DHOTSPOT_ASM
9+CCFLAGS += -DHOTSPOT_ASM
10
11 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
12 arm32JIT.o: offsets_arm.s
13
14 offsets_arm.s: mkoffsets
15 @echo Generating assembler offsets
16- ./mkoffsets > $@
17+ $(QEMU) ./mkoffsets > $@
18
19 bytecodes_arm.s: bytecodes_arm.def mkbc
20 @echo Generating ARM assembler bytecode sequences
21- $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
22+ $(CXX_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE)
23
24 mkbc: $(GAMMADIR)/tools/mkbc.c
25 @echo Compiling mkbc tool
26- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
27+ $(CC_COMPILE) -static -fuse-ld=bfd -o $@ $< $(COMPILE_DONE)
28
29 mkoffsets: asm_helper.cpp
30 @echo Compiling offset generator
31 $(QUIETLY) $(REMOVE_TARGET)
32- $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
33+ $(CXX_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
34
35 endif
36 endif