summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-08-20 12:41:58 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-08-24 08:19:14 +0200
commit3b65eea96eddde97169ca5e00be01a9dbd257786 (patch)
tree9e6ec626f6e96141ad015ecdfa5d38453160f70e /recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch
parent00cb61feb07098d55b78237af6eb55fc4b906a0e (diff)
downloadmeta-java-3b65eea96eddde97169ca5e00be01a9dbd257786.tar.gz
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 <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch43
1 files changed, 43 insertions, 0 deletions
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 @@
1From 5aba5bcf8fb4c7d7493662dd89689809fb401433 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com>
3Date: Thu, 2 Jan 2020 10:19:29 +0100
4Subject: [PATCH 1009/1013] hotspot: fix adlc flags
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9adlc is built using the native toolchain, not the crosscompiler. It however
10was incorrectly using flags meant for the crosscompiler.
11
12Upstream-Status: Inappropriate [Yocto-specific fixes]
13
14Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
15Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
16---
17 make/linux/makefiles/adlc.make | 10 ++++++++++
18 1 file changed, 10 insertions(+)
19
20diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make
21index 92b8b9b39..ae0aa0082 100644
22--- a/hotspot/make/linux/makefiles/adlc.make
23+++ b/hotspot/make/linux/makefiles/adlc.make
24@@ -28,6 +28,16 @@
25
26 include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make
27
28+# Yocto specific fix - remove target machine flags and replace them with
29+# build machine flags, as this part is built using the native toolchain
30+CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS))
31+CFLAGS:=$(filter-out $(TARGET_CFLAGS),$(CFLAGS))
32+
33+CXXFLAGS += $(BUILD_CXXFLAGS)
34+CFLAGS += $(BUILD_CFLAGS)
35+
36+
37+
38 # #########################################################################
39
40 # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make:
41--
422.26.2
43