From 3b65eea96eddde97169ca5e00be01a9dbd257786 Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Thu, 20 Aug 2020 12:41:58 +0200 Subject: openjdk-8: update to latest ga version 265 Patch related changes: * The hotspot patch 1004 was mainlined in changeset 3a3803a0c789 [1] and is therfore dropped. * The jdk patch 2010 was mainlined in changeset c4418d567028 [2] and is therefore dropped. * Rename hotspot/aarch64 patches to start with number 1401. * Rename hotspot/aarch32 patches to start with number 1201. * Merge aarch32-hotspot-fix-shark-build-pt2.patch and openjdk8-fix-shark-build-pt2.patch to hotspot patch 1013 as they were the same. [1] https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/3a3803a0c789 [2] https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/c4418d567028 Signed-off-by: Richard Leitner --- .../1009-hotspot-fix-adlc-flags.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch (limited to 'recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch') diff --git a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch new file mode 100644 index 0000000..3c2bbbd --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch @@ -0,0 +1,43 @@ +From 5aba5bcf8fb4c7d7493662dd89689809fb401433 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= +Date: Thu, 2 Jan 2020 10:19:29 +0100 +Subject: [PATCH 1009/1013] hotspot: fix adlc flags +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +adlc is built using the native toolchain, not the crosscompiler. It however +was incorrectly using flags meant for the crosscompiler. + +Upstream-Status: Inappropriate [Yocto-specific fixes] + +Signed-off-by: Erkka Kääriä +Signed-off-by: Richard Leitner +--- + make/linux/makefiles/adlc.make | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make +index 92b8b9b39..ae0aa0082 100644 +--- a/hotspot/make/linux/makefiles/adlc.make ++++ b/hotspot/make/linux/makefiles/adlc.make +@@ -28,6 +28,16 @@ + + include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make + ++# Yocto specific fix - remove target machine flags and replace them with ++# build machine flags, as this part is built using the native toolchain ++CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS)) ++CFLAGS:=$(filter-out $(TARGET_CFLAGS),$(CFLAGS)) ++ ++CXXFLAGS += $(BUILD_CXXFLAGS) ++CFLAGS += $(BUILD_CFLAGS) ++ ++ ++ + # ######################################################################### + + # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: +-- +2.26.2 + -- cgit v1.2.3-54-g00ecf