aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch
new file mode 100644
index 0000000..03f8660
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch
@@ -0,0 +1,43 @@
+From 89408e465d92657de8c54d4622f1810c28c3d700 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com>
+Date: Thu, 2 Jan 2020 10:19:29 +0100
+Subject: [PATCH 1010/1012] 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ä <erkka.kaaria@intel.com>
+Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
+---
+ 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.24.1
+