diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2019-12-30 15:35:59 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-17 13:02:40 +0200 |
commit | 040bfc7748f37b258f8f1d2c6f1d2d44127bf173 (patch) | |
tree | 4a147312e7398d03f0f8bbffd52f71233fa91957 /recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch | |
parent | 4bcf80651fa555611c13c02eaab3529ccf31bbf6 (diff) | |
download | meta-java-040bfc7748f37b258f8f1d2c6f1d2d44127bf173.tar.gz |
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build"
version the recipes are adapted to use those "ga" versions.
All existing patches got re-applied and renamed. For better handling Hotspot
patches now start at patch number 1001 and jdk patches at 2001.
Furthermore architecture dependent patches are prefixed with the
architecture they apply on.
Following patches/hunks were completely dropped:
- 0002-hotspot-fix-compilation-with-security-flags-enabled.patch
got backported to hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185
- 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
ostream.cpp:112 got fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502
- 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch
got backported to hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916
- 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd
- 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c
- openjdk8-add-missing-linker-flags.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a
- openjdk8-fix-shark-stdc++11.patch
fixed in hotspot jdk8u
- openjdk8-fix-libpng-neon-build.patch
fixed in jdk
https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1
- aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch
got backported to hotspot jdk8u
Following patches were newly added:
- 0011-autoconf-fix-CC-with-arguments-detection.patch
needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris"
- 0012-autoconf-NativeCompilation-remove-sysroot.patch
needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris"
Additionally add UPDATING.md which describes the openjdk8 update process
for this layer and update8checksums.sh, a script that updates the
openjdk8 source archive checksums in the corresponding .inc files.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
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.patch | 43 |
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 @@ | |||
1 | From 89408e465d92657de8c54d4622f1810c28c3d700 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> | ||
3 | Date: Thu, 2 Jan 2020 10:19:29 +0100 | ||
4 | Subject: [PATCH 1010/1012] hotspot: fix adlc flags | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | adlc is built using the native toolchain, not the crosscompiler. It however | ||
10 | was incorrectly using flags meant for the crosscompiler. | ||
11 | |||
12 | Upstream-Status: Inappropriate [Yocto-specific fixes] | ||
13 | |||
14 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> | ||
15 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
16 | --- | ||
17 | make/linux/makefiles/adlc.make | 10 ++++++++++ | ||
18 | 1 file changed, 10 insertions(+) | ||
19 | |||
20 | diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make | ||
21 | index 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 | -- | ||
42 | 2.24.1 | ||
43 | |||