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/1006-hotspot-Missing-return-statement-in-__sync_val_compa.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/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch index 18aca4c..2e32702 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5e21de887d87243b6be03781afb4015c4673851c Mon Sep 17 00:00:00 2001 | 1 | From 1f618dcda554d85d1c1dcd1bfd84d9554cb2f3b8 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:46:33 +0100 | 3 | Date: Mon, 13 Aug 2018 16:46:33 +0100 |
4 | Subject: [PATCH 1006/1013] hotspot: Missing return statement in | 4 | Subject: [PATCH] hotspot: Missing return statement in |
5 | __sync_val_compare_and_swap_8 | 5 | __sync_val_compare_and_swap_8 |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -21,13 +21,14 @@ Upstream-Status: Backport | |||
21 | 21 | ||
22 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 22 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
24 | |||
24 | --- | 25 | --- |
25 | src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + | 26 | hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + |
26 | src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + | 27 | hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + |
27 | 2 files changed, 2 insertions(+) | 28 | 2 files changed, 2 insertions(+) |
28 | 29 | ||
29 | diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 30 | diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
30 | index c857b5526..4aaf78b1d 100644 | 31 | index c857b552..4aaf78b1 100644 |
31 | --- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 32 | --- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
32 | +++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 33 | +++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
33 | @@ -457,6 +457,7 @@ extern "C" { | 34 | @@ -457,6 +457,7 @@ extern "C" { |
@@ -39,7 +40,7 @@ index c857b5526..4aaf78b1d 100644 | |||
39 | }; | 40 | }; |
40 | #endif // !_LP64 | 41 | #endif // !_LP64 |
41 | 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 | 42 | 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 |
42 | index cbee43baa..136d4d3de 100644 | 43 | index cbee43ba..136d4d3d 100644 |
43 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 44 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
44 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 45 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
45 | @@ -498,6 +498,7 @@ extern "C" { | 46 | @@ -498,6 +498,7 @@ extern "C" { |
@@ -50,6 +51,3 @@ index cbee43baa..136d4d3de 100644 | |||
50 | } | 51 | } |
51 | }; | 52 | }; |
52 | #endif // !_LP64 | 53 | #endif // !_LP64 |
53 | -- | ||
54 | 2.26.2 | ||
55 | |||