summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-08-20 12:41:58 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-08-24 08:19:14 +0200
commit3b65eea96eddde97169ca5e00be01a9dbd257786 (patch)
tree9e6ec626f6e96141ad015ecdfa5d38453160f70e /recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch
parent00cb61feb07098d55b78237af6eb55fc4b906a0e (diff)
downloadmeta-java-3b65eea96eddde97169ca5e00be01a9dbd257786.tar.gz
openjdk-8: update to latest ga version 265
Patch related changes: * The hotspot patch 1004 was mainlined in changeset 3a3803a0c789 [1] and is therfore dropped. * The jdk patch 2010 was mainlined in changeset c4418d567028 [2] and is therefore dropped. * Rename hotspot/aarch64 patches to start with number 1401. * Rename hotspot/aarch32 patches to start with number 1201. * Merge aarch32-hotspot-fix-shark-build-pt2.patch and openjdk8-fix-shark-build-pt2.patch to hotspot patch 1013 as they were the same. [1] https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/3a3803a0c789 [2] https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/c4418d567028 Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch
deleted file mode 100644
index daa43a7..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 3c9da574b8610a0a1f4bdd8a2cb44a6aee8e3a89 Mon Sep 17 00:00:00 2001
2From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com>
3Date: Fri, 21 Sep 2018 10:44:06 +0200
4Subject: [PATCH 1009/1013] hotspot: handle format error for GCC >= 7
5
6Upstream-Status: Pending
7
8Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com>
9Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
10---
11 src/share/vm/adlc/output_c.cpp | 6 ++++--
12 1 file changed, 4 insertions(+), 2 deletions(-)
13
14diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp
15index 199169046..889b785c1 100644
16--- a/hotspot/src/share/vm/adlc/output_c.cpp
17+++ b/hotspot/src/share/vm/adlc/output_c.cpp
18@@ -419,9 +419,11 @@ static int pipeline_res_mask_initializer(
19 for (i = maxcycleused; i > 0; i /= 10)
20 cycledigit++;
21
22- int maskdigit = 0;
23- for (i = rescount; i > 0; i /= 10)
24+ int maskdigit = 1;
25+ for (i = rescount / 10; i > 0; i /= 10)
26 maskdigit++;
27+ if (maskdigit > 10)
28+ maskdigit = 10;
29
30 static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask";
31 static const char* pipeline_use_element = "Pipeline_Use_Element";
32--
332.26.2
34