summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-08-20 09:41:33 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-08-20 14:01:17 +0200
commit927a58dbfded8de3f1fe9754ca38c6867fff79a2 (patch)
tree559b4e810035a1dee358743d45ded209b477de75
parent7483a6c981c85517bb39f03bf20bcce4e3ce3b5c (diff)
downloadmeta-java-927a58dbfded8de3f1fe9754ca38c6867fff79a2.tar.gz
openjdk-8: refresh patches
Refresh all openjdk8 patches as a preparation for the upcoming update. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r--recipes-core/openjdk/openjdk-8-release-common.inc2
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch14
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch10
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1013-hotspot-enable-Wno-error.patch33
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1013-hotspot-make-disable-Werror.patch14
15 files changed, 76 insertions, 57 deletions
diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc
index 02210a1..3e4a0cf 100644
--- a/recipes-core/openjdk/openjdk-8-release-common.inc
+++ b/recipes-core/openjdk/openjdk-8-release-common.inc
@@ -31,7 +31,7 @@ HOTSPOT_UB_PATCH = "\
31 file://1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ 31 file://1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch \
32 file://1008-hotspot-Turn-on-the-Wreturn-type-warning.patch \ 32 file://1008-hotspot-Turn-on-the-Wreturn-type-warning.patch \
33 file://1009-hotspot-handle-format-error-for-GCC-7.patch \ 33 file://1009-hotspot-handle-format-error-for-GCC-7.patch \
34 file://1013-hotspot-make-disable-Werror.patch \ 34 file://1013-hotspot-enable-Wno-error.patch \
35" 35"
36HOTSPOT_UB_PATCH_append_class-target = "\ 36HOTSPOT_UB_PATCH_append_class-target = "\
37 file://1010-hotspot-fix-adlc-flags.patch \ 37 file://1010-hotspot-fix-adlc-flags.patch \
diff --git a/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
index 280ee60..2393869 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
@@ -1,7 +1,7 @@
1From 5e8080a8dd56205f550f7c490f864c95dc8e509b Mon Sep 17 00:00:00 2001 1From d01c03bb68692365f1cf8c8e79c42b7452b83928 Mon Sep 17 00:00:00 2001
2From: Wenlin Kang <wenlin.kang@windriver.com> 2From: Wenlin Kang <wenlin.kang@windriver.com>
3Date: Sun, 17 Feb 2019 22:38:33 -0800 3Date: Sun, 17 Feb 2019 22:38:33 -0800
4Subject: [PATCH 1001/1012] hotspot: fix crash on JNI_CreateJavaVM 4Subject: [PATCH 1001/1013] hotspot: fix crash on JNI_CreateJavaVM
5 5
6In function os::pd_create_stack_guard_pages(char* addr, size_t size), 6In function os::pd_create_stack_guard_pages(char* addr, size_t size),
7when addr < os::Linux::initial_thread_stack_bottom(), usually munmap() 7when addr < os::Linux::initial_thread_stack_bottom(), usually munmap()
@@ -33,5 +33,5 @@ index 03cabfefb..4f28cc1fb 100644
33 stack_extent = (uintptr_t) get_stack_commited_bottom( 33 stack_extent = (uintptr_t) get_stack_commited_bottom(
34 os::Linux::initial_thread_stack_bottom(), 34 os::Linux::initial_thread_stack_bottom(),
35-- 35--
362.24.1 362.26.2
37 37
diff --git a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch
index 3f678dd..19e12fb 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch
@@ -1,7 +1,7 @@
1From df566df123c8af8252c0e113c41c32482834923e Mon Sep 17 00:00:00 2001 1From 0fdafd1b0cf7c9abc956d0dbe611f7aa7186c70b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 09:28:06 +0000 3Date: Tue, 27 Feb 2018 09:28:06 +0000
4Subject: [PATCH 1002/1012] hotspot: use correct include for poll 4Subject: [PATCH 1002/1013] hotspot: use correct include for poll
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -83,5 +83,5 @@ index 8e095ab69..ce37e9a12 100644
83 #include <unistd.h> 83 #include <unistd.h>
84 #include <netdb.h> 84 #include <netdb.h>
85-- 85--
862.24.1 862.26.2
87 87
diff --git a/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch
index 8e31461..b4c64c6 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch
@@ -1,7 +1,7 @@
1From e5bf672f4e10997789f2a447fd95a88703dbd332 Mon Sep 17 00:00:00 2001 1From 43292d7d298432228ef270696921af7a5d73a833 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 15:00:55 +0000 3Date: Tue, 27 Feb 2018 15:00:55 +0000
4Subject: [PATCH 1003/1012] hotspot: don't rely on old SysV SIGCLD 4Subject: [PATCH 1003/1013] hotspot: don't rely on old SysV SIGCLD
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -39,5 +39,5 @@ index ba84788a1..c22281f7c 100644
39 "CONT", SIGCONT, /* Continue (POSIX). */ 39 "CONT", SIGCONT, /* Continue (POSIX). */
40 "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ 40 "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */
41-- 41--
422.24.1 422.26.2
43 43
diff --git a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
index ad480e3..69b85aa 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
@@ -1,7 +1,7 @@
1From 3a6eef99b27b7dd750e7a02eb3ada71db99d9345 Mon Sep 17 00:00:00 2001 1From 1beb42da8445e9ca6c8560f8c78cac185fffb64d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Fri, 10 Aug 2018 14:54:45 +0100 3Date: Fri, 10 Aug 2018 14:54:45 +0100
4Subject: [PATCH 1004/1012] hotspot: backport patch to fix misuses of 4Subject: [PATCH 1004/1013] hotspot: backport patch to fix misuses of
5 strncpy/strncat 5 strncpy/strncat
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
@@ -84,10 +84,10 @@ index 93cd9e854..e7b32cd6b 100644
84 } 84 }
85 } else if (match(event, "format bytes-per-line")) { 85 } else if (match(event, "format bytes-per-line")) {
86diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp 86diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
87index 2665b6b8c..5a9294677 100644 87index 7c85a0da8..ea4026b98 100644
88--- a/hotspot/src/share/vm/runtime/arguments.cpp 88--- a/hotspot/src/share/vm/runtime/arguments.cpp
89+++ b/hotspot/src/share/vm/runtime/arguments.cpp 89+++ b/hotspot/src/share/vm/runtime/arguments.cpp
90@@ -3455,7 +3455,7 @@ void Arguments::fix_appclasspath() { 90@@ -3456,7 +3456,7 @@ void Arguments::fix_appclasspath() {
91 } 91 }
92 92
93 char* copy = AllocateHeap(strlen(src) + 1, mtInternal); 93 char* copy = AllocateHeap(strlen(src) + 1, mtInternal);
@@ -96,7 +96,7 @@ index 2665b6b8c..5a9294677 100644
96 96
97 // trim all trailing empty paths 97 // trim all trailing empty paths
98 for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) { 98 for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) {
99@@ -3834,17 +3834,16 @@ static char* get_shared_archive_path() { 99@@ -3835,17 +3835,16 @@ static char* get_shared_archive_path() {
100 if (end != NULL) *end = '\0'; 100 if (end != NULL) *end = '\0';
101 size_t jvm_path_len = strlen(jvm_path); 101 size_t jvm_path_len = strlen(jvm_path);
102 size_t file_sep_len = strlen(os::file_separator()); 102 size_t file_sep_len = strlen(os::file_separator());
@@ -148,7 +148,7 @@ index 1b00f829a..4daea2b7e 100644
148 // Note that the following does not depend on write_len. 148 // Note that the following does not depend on write_len.
149 // This means that position and count get updated 149 // This means that position and count get updated
150diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp 150diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
151index ef3bb5cee..c11fef472 100644 151index 49b978a02..97c5e33f2 100644
152--- a/hotspot/src/share/vm/utilities/vmError.cpp 152--- a/hotspot/src/share/vm/utilities/vmError.cpp
153+++ b/hotspot/src/share/vm/utilities/vmError.cpp 153+++ b/hotspot/src/share/vm/utilities/vmError.cpp
154@@ -450,14 +450,7 @@ void VMError::report(outputStream* st) { 154@@ -450,14 +450,7 @@ void VMError::report(outputStream* st) {
@@ -168,5 +168,5 @@ index ef3bb5cee..c11fef472 100644
168 st->print(" (0x%x)", _id); 168 st->print(" (0x%x)", _id);
169 } 169 }
170-- 170--
1712.24.1 1712.26.2
172 172
diff --git a/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch
index 81177d0..ce86997 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch
@@ -1,7 +1,7 @@
1From bce7b39095a839b8e77fe068e87150e855224705 Mon Sep 17 00:00:00 2001 1From 0ba0fdd1596b31af69abc2fc1a9d96e77ab61a0c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:40:34 +0100 3Date: Mon, 13 Aug 2018 16:40:34 +0100
4Subject: [PATCH 1005/1012] hotspot: fix -Wreturn-type issues introduced by 4Subject: [PATCH 1005/1013] hotspot: fix -Wreturn-type issues introduced by
5 8061651 5 8061651
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
@@ -55,5 +55,5 @@ index f43dc5ed7..8d7523c55 100644
55 return NULL; 55 return NULL;
56 #endif 56 #endif
57-- 57--
582.24.1 582.26.2
59 59
diff --git a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch
index 38067cb..cddd4bf 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch
@@ -1,7 +1,7 @@
1From 84fc6448f44cd45a5448d0e88df8ccabfa10dcc5 Mon Sep 17 00:00:00 2001 1From 69d92c4763bd8c1545fb29af7fc54f6f58b87a65 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:45:24 +0100 3Date: Mon, 13 Aug 2018 16:45:24 +0100
4Subject: [PATCH 1006/1012] hotspot: Zero build requires disabled warnings 4Subject: [PATCH 1006/1013] hotspot: Zero build requires disabled warnings
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -138,5 +138,5 @@ index 39f77f858..b9c73dc48 100644
138 138
139 // These routines are only used on cpu architectures that 139 // These routines are only used on cpu architectures that
140-- 140--
1412.24.1 1412.26.2
142 142
diff --git a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch
index 6692200..79e3b7a 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch
@@ -1,7 +1,7 @@
1From 996a1e3d53773f41e9098117a69a060722972269 Mon Sep 17 00:00:00 2001 1From 8f0a48544832278f9b6503dae1a03b05da41b8fc Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:46:33 +0100 3Date: Mon, 13 Aug 2018 16:46:33 +0100
4Subject: [PATCH 1007/1012] hotspot: Missing return statement in 4Subject: [PATCH 1007/1013] hotspot: Missing return statement in
5 __sync_val_compare_and_swap_8 5 __sync_val_compare_and_swap_8
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
@@ -51,5 +51,5 @@ index cbee43baa..136d4d3de 100644
51 }; 51 };
52 #endif // !_LP64 52 #endif // !_LP64
53-- 53--
542.24.1 542.26.2
55 55
diff --git a/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch
index 10dd0f7..d8eae8b 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch
@@ -1,7 +1,7 @@
1From 2cce90259f9de7b5fba7f3380cdc90b3a586aa75 Mon Sep 17 00:00:00 2001 1From b9273263a4ddc38c61bf0e59819bc9503495b5a1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:48:32 +0100 3Date: Mon, 13 Aug 2018 16:48:32 +0100
4Subject: [PATCH 1008/1012] hotspot: Turn on the -Wreturn-type warning 4Subject: [PATCH 1008/1013] hotspot: Turn on the -Wreturn-type warning
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -231,5 +231,5 @@ index 7ad2b71f4..182084373 100644
231 static inline void record_thread_stack(void* addr, size_t size) { } 231 static inline void record_thread_stack(void* addr, size_t size) { }
232 static inline void release_thread_stack(void* addr, size_t size) { } 232 static inline void release_thread_stack(void* addr, size_t size) { }
233-- 233--
2342.24.1 2342.26.2
235 235
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
index ee950cd..daa43a7 100644
--- 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
@@ -1,7 +1,7 @@
1From d085dcce6f8700fd8ddda475357496ea6da323dc Mon Sep 17 00:00:00 2001 1From 3c9da574b8610a0a1f4bdd8a2cb44a6aee8e3a89 Mon Sep 17 00:00:00 2001
2From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> 2From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com>
3Date: Fri, 21 Sep 2018 10:44:06 +0200 3Date: Fri, 21 Sep 2018 10:44:06 +0200
4Subject: [PATCH 1009/1012] hotspot: handle format error for GCC >= 7 4Subject: [PATCH 1009/1013] hotspot: handle format error for GCC >= 7
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -12,10 +12,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
12 1 file changed, 4 insertions(+), 2 deletions(-) 12 1 file changed, 4 insertions(+), 2 deletions(-)
13 13
14diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp 14diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp
15index b3766636d..eba08d2f0 100644 15index 199169046..889b785c1 100644
16--- a/hotspot/src/share/vm/adlc/output_c.cpp 16--- a/hotspot/src/share/vm/adlc/output_c.cpp
17+++ b/hotspot/src/share/vm/adlc/output_c.cpp 17+++ b/hotspot/src/share/vm/adlc/output_c.cpp
18@@ -436,9 +436,11 @@ static int pipeline_res_mask_initializer( 18@@ -419,9 +419,11 @@ static int pipeline_res_mask_initializer(
19 for (i = maxcycleused; i > 0; i /= 10) 19 for (i = maxcycleused; i > 0; i /= 10)
20 cycledigit++; 20 cycledigit++;
21 21
@@ -30,5 +30,5 @@ index b3766636d..eba08d2f0 100644
30 static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; 30 static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask";
31 static const char* pipeline_use_element = "Pipeline_Use_Element"; 31 static const char* pipeline_use_element = "Pipeline_Use_Element";
32-- 32--
332.24.1 332.26.2
34 34
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
index 03f8660..eba2b11 100644
--- 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
@@ -1,7 +1,7 @@
1From 89408e465d92657de8c54d4622f1810c28c3d700 Mon Sep 17 00:00:00 2001 1From 7f0202182455d5705501dda97e86aa99506b13b4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> 2From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com>
3Date: Thu, 2 Jan 2020 10:19:29 +0100 3Date: Thu, 2 Jan 2020 10:19:29 +0100
4Subject: [PATCH 1010/1012] hotspot: fix adlc flags 4Subject: [PATCH 1010/1013] hotspot: fix adlc flags
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -39,5 +39,5 @@ index 92b8b9b39..ae0aa0082 100644
39 39
40 # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: 40 # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make:
41-- 41--
422.24.1 422.26.2
43 43
diff --git a/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch
index 8fe5489..f00d56b 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch
@@ -1,7 +1,7 @@
1From 1015cc718ba25cabf613b96fd58baa8dfb8492fe Mon Sep 17 00:00:00 2001 1From 2a9fddfb3370278f021858f28524dd83f1d6d1aa Mon Sep 17 00:00:00 2001
2From: Jens Rehsack <rehsack@gmail.com> 2From: Jens Rehsack <rehsack@gmail.com>
3Date: Thu, 2 Jan 2020 10:22:19 +0100 3Date: Thu, 2 Jan 2020 10:22:19 +0100
4Subject: [PATCH 1011/1012] hotspot: fix shark build (common) 4Subject: [PATCH 1011/1013] hotspot: fix shark build (common)
5 5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7--- 7---
@@ -444,5 +444,5 @@ index 243183c07..601ca7925 100644
444 builder()->CreateICmpEQ(lock, check), 444 builder()->CreateICmpEQ(lock, check),
445 released_fast, slow_path); 445 released_fast, slow_path);
446-- 446--
4472.24.1 4472.26.2
448 448
diff --git a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch
index b61f664..92af81d 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch
@@ -1,7 +1,7 @@
1From e4c080e29afa3f93383c1e046273cd20ec835ca3 Mon Sep 17 00:00:00 2001 1From 1f9bb32ae75517a7ce53a5e3bf4395f8826cec48 Mon Sep 17 00:00:00 2001
2From: Jens Rehsack <rehsack@gmail.com> 2From: Jens Rehsack <rehsack@gmail.com>
3Date: Thu, 2 Jan 2020 10:23:38 +0100 3Date: Thu, 2 Jan 2020 10:23:38 +0100
4Subject: [PATCH 1012/1012] hotspot: restrict to staging dir 4Subject: [PATCH 1012/1013] hotspot: restrict to staging dir
5 5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7--- 7---
@@ -22,5 +22,5 @@ index 386e94b1f..7642a67f8 100644
22 DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) 22 DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE))
23 REASON = "$(SDT_H_FILE) not found" 23 REASON = "$(SDT_H_FILE) not found"
24-- 24--
252.24.1 252.26.2
26 26
diff --git a/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-enable-Wno-error.patch b/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-enable-Wno-error.patch
new file mode 100644
index 0000000..cdfe364
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-enable-Wno-error.patch
@@ -0,0 +1,33 @@
1From beeb3ed0855f1a2a6075da0ff2f93dc5654ab1d5 Mon Sep 17 00:00:00 2001
2From: Richard Leitner <richard.leitner@skidata.com>
3Date: Thu, 20 Aug 2020 09:39:23 +0200
4Subject: [PATCH 1013/1013] hotspot: enable -Wno-error
5
6As we don't want to deal with compiler warnings in OpenEmbedded disable
7them for now.
8
9Upstream-Status: Pending
10
11Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
12---
13 make/linux/makefiles/gcc.make | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make
17index cd9511e50..94412c8fe 100644
18--- a/hotspot/make/linux/makefiles/gcc.make
19+++ b/hotspot/make/linux/makefiles/gcc.make
20@@ -200,8 +200,8 @@ else
21 CFLAGS += -pipe
22 endif
23
24-# Compiler warnings are treated as errors
25-WARNINGS_ARE_ERRORS = -Werror
26+# Compiler warnings are not treated as errors
27+WARNINGS_ARE_ERRORS = -Wno-error
28
29 ifeq ($(USE_CLANG), true)
30 # However we need to clean the code up before we can unrestrictedly enable this option with Clang
31--
322.26.2
33
diff --git a/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-make-disable-Werror.patch b/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-make-disable-Werror.patch
deleted file mode 100644
index bc844be..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-make-disable-Werror.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1diff -r 12177d88b89c hotspot/make/linux/makefiles/gcc.make
2--- a/hotspot/make/linux/makefiles/gcc.make Thu Sep 26 07:17:41 2019 +0100
3+++ b/hotspot/make/linux/makefiles/gcc.make Wed Apr 29 10:56:10 2020 +0200
4@@ -200,8 +200,8 @@
5 CFLAGS += -pipe
6 endif
7
8-# Compiler warnings are treated as errors
9-WARNINGS_ARE_ERRORS = -Werror
10+# Compiler warnings are not treated as errors
11+WARNINGS_ARE_ERRORS = -Wno-error
12
13 ifeq ($(USE_CLANG), true)
14 # However we need to clean the code up before we can unrestrictedly enable this option with Clang