summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-8_72b05.bb1
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch34
2 files changed, 35 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-8_72b05.bb b/recipes-core/openjdk/openjdk-8_72b05.bb
index 1a01630..feaf227 100644
--- a/recipes-core/openjdk/openjdk-8_72b05.bb
+++ b/recipes-core/openjdk/openjdk-8_72b05.bb
@@ -10,6 +10,7 @@ PATCHES_URI_append = "\
10 file://openjdk8-fix-shark-stdc++11.patch;apply=no \ 10 file://openjdk8-fix-shark-stdc++11.patch;apply=no \
11 file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ 11 file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \
12 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ 12 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \
13 file://openjdk8-fix-adlc-flags.patch;apply=no \
13" 14"
14 15
15do_compile_append() { 16do_compile_append() {
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch
new file mode 100644
index 0000000..fa26d04
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch
@@ -0,0 +1,34 @@
1adlc is built using the native toolchain, not the crosscompiler. It however
2was incorrectly using flags meant for the crosscompiler.
3
4Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
5
6Upstream-Status: Inappropriate [Yocto-specific fixes]
7
8---
9 hotspot/make/linux/makefiles/adlc.make | 10 ++++++++++
10 1 file changed, 10 insertions(+)
11
12diff --git hotspot/make/linux/makefiles/adlc.make hotspot/make/linux/makefiles/adlc.make
13index 8a86691..2789c03 100644
14--- hotspot/make/linux/makefiles/adlc.make
15+++ hotspot/make/linux/makefiles/adlc.make
16@@ -28,6 +28,16 @@
17
18 include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make
19
20+# Yocto specific fix - remove target machine flags and replace them with
21+# build machine flags, as this part is built using the native toolchain
22+CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS))
23+CFLAGS:=$(filter-out $(TARGET_CFLAGS),$(CFLAGS))
24+
25+CXXFLAGS += $(BUILD_CXXFLAGS)
26+CFLAGS += $(BUILD_CFLAGS)
27+
28+
29+
30 # #########################################################################
31
32 # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make:
33--
341.9.1