From ed95222b71cc58f6039bdf944b0e11ce00fb0bf5 Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Wed, 28 Oct 2015 13:07:19 +0100 Subject: 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 Acked-by: Otavio Salvador Signed-off-by: Otavio Salvador --- .../icedtea-zero-hotspotfix.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch (limited to 'recipes-core/openjdk/patches-openjdk-7/icedtea-zero-hotspotfix.patch') 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 @@ +diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make +index c2a1484..156bdd0 100644 +--- openjdk/hotspot/make/linux/makefiles/zeroshark.make ++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make +@@ -33,26 +33,27 @@ + Obj_Files += arm32JIT.o + + CFLAGS += -DHOTSPOT_ASM ++CCFLAGS += -DHOTSPOT_ASM + + cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s + arm32JIT.o: offsets_arm.s + + offsets_arm.s: mkoffsets + @echo Generating assembler offsets +- ./mkoffsets > $@ ++ $(QEMU) ./mkoffsets > $@ + + bytecodes_arm.s: bytecodes_arm.def mkbc + @echo Generating ARM assembler bytecode sequences +- $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) ++ $(CXX_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE) + + mkbc: $(GAMMADIR)/tools/mkbc.c + @echo Compiling mkbc tool +- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) ++ $(CC_COMPILE) -static -fuse-ld=bfd -o $@ $< $(COMPILE_DONE) + + mkoffsets: asm_helper.cpp + @echo Compiling offset generator + $(QUIETLY) $(REMOVE_TARGET) +- $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) ++ $(CXX_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) + + endif + endif -- cgit v1.2.3-54-g00ecf