diff options
author | Geoff Parker <geoffrey.parker@arthrex.com> | 2023-05-01 19:26:20 -0700 |
---|---|---|
committer | Richard <g0hl1n@users.noreply.github.com> | 2023-05-02 09:02:27 +0200 |
commit | bf6ae1dac46dc9894f206c7f81570548dbf6785c (patch) | |
tree | 6cffa5a73f21963c52034d5dc5f66f8d935e3d96 /recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch | |
parent | e122acf3e9570ceb055e55feb41e5558463253e4 (diff) | |
download | meta-java-bf6ae1dac46dc9894f206c7f81570548dbf6785c.tar.gz |
openjdk-8: Update patches for patch fuzz for Yocto 4.2 mickledore
Yocto 4.2 bitbake is more pedantic on patch fuzz, which treats
patch fuzz Warnings as Errors, and fails the bulid.
Corrected patch fuzz with:
devtool modify openjdk-8-native
devtool finish --force-patch-refresh openjdk-8-native <meta-java layer_path>
but removed the changes to 1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
which rewrote a huge amount of source files in their entirety for some reason.
Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch index fe1837d..36eefe5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f8a3f19fa4fabaf57b0c2c77e966d9896399b3f8 Mon Sep 17 00:00:00 2001 | 1 | From 9ae232a21a7c2cec88cdb4ff7e6cf7092f1578ab Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 13 Aug 2018 16:45:24 +0100 | 3 | Date: Mon, 13 Aug 2018 16:45:24 +0100 |
4 | Subject: [PATCH 1005/1013] hotspot: Zero build requires disabled warnings | 4 | Subject: [PATCH] hotspot: Zero build requires disabled warnings |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -19,15 +19,16 @@ Upstream-Status: Backport | |||
19 | 19 | ||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 20 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
22 | |||
22 | --- | 23 | --- |
23 | src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- | 24 | hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- |
24 | src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- | 25 | hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- |
25 | src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++-- | 26 | hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++-- |
26 | src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- | 27 | .../src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- |
27 | 4 files changed, 17 insertions(+), 6 deletions(-) | 28 | 4 files changed, 17 insertions(+), 6 deletions(-) |
28 | 29 | ||
29 | diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 30 | diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
30 | index 525031eb9..d47422b8c 100644 | 31 | index 525031eb..d47422b8 100644 |
31 | --- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 32 | --- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
32 | +++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 33 | +++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
33 | @@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { | 34 | @@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { |
@@ -40,7 +41,7 @@ index 525031eb9..d47422b8c 100644 | |||
40 | } | 41 | } |
41 | 42 | ||
42 | diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 43 | diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
43 | index e23e3eaa9..061ed8ce8 100644 | 44 | index e23e3eaa..061ed8ce 100644 |
44 | --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 45 | --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
45 | +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 46 | +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
46 | @@ -1,5 +1,5 @@ | 47 | @@ -1,5 +1,5 @@ |
@@ -60,7 +61,7 @@ index e23e3eaa9..061ed8ce8 100644 | |||
60 | case T_VOID: | 61 | case T_VOID: |
61 | ftype = &ffi_type_void; | 62 | ftype = &ffi_type_void; |
62 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 63 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
63 | index d22ea1141..cbee43baa 100644 | 64 | index d22ea114..cbee43ba 100644 |
64 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 65 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
65 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 66 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
66 | @@ -61,6 +61,7 @@ address os::current_stack_pointer() { | 67 | @@ -61,6 +61,7 @@ address os::current_stack_pointer() { |
@@ -119,7 +120,7 @@ index d22ea1141..cbee43baa 100644 | |||
119 | 120 | ||
120 | void os::Linux::set_fpu_control_word(int fpu) { | 121 | void os::Linux::set_fpu_control_word(int fpu) { |
121 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 122 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp |
122 | index 94bc83a30..b3ba526f2 100644 | 123 | index 94bc83a3..b3ba526f 100644 |
123 | --- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 124 | --- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp |
124 | +++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 125 | +++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp |
125 | @@ -1,5 +1,5 @@ | 126 | @@ -1,5 +1,5 @@ |
@@ -137,6 +138,3 @@ index 94bc83a30..b3ba526f2 100644 | |||
137 | } | 138 | } |
138 | 139 | ||
139 | bool pd_get_top_frame_for_profiling(frame* fr_addr, | 140 | bool pd_get_top_frame_for_profiling(frame* fr_addr, |
140 | -- | ||
141 | 2.26.2 | ||
142 | |||