blob: eba2b1149a1ce2da6b4ed11ebad04629f42bb212 (
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
35
36
37
38
39
40
41
42
43
|
From 7f0202182455d5705501dda97e86aa99506b13b4 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/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ä <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.26.2
|
