aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch
blob: fa26d04e0a450d411801f41edb202cda7224faa3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
adlc is built using the native toolchain, not the crosscompiler. It however
was incorrectly using flags meant for the crosscompiler.

Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>

Upstream-Status: Inappropriate [Yocto-specific fixes]

---
 hotspot/make/linux/makefiles/adlc.make | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git hotspot/make/linux/makefiles/adlc.make hotspot/make/linux/makefiles/adlc.make
index 8a86691..2789c03 100644
--- hotspot/make/linux/makefiles/adlc.make
+++ 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:
--
1.9.1