diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 09:00:08 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 15:11:36 +0200 |
commit | e5510ba991a5494e562776f135fc07f2999a86a8 (patch) | |
tree | 48c5fb5d665af845c4dfd92861dc99aa88b71347 /recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch | |
parent | a599da830cdfe8f50534a8b5d4b8b963b34bc045 (diff) | |
download | meta-java-e5510ba991a5494e562776f135fc07f2999a86a8.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/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 | 142 |
1 files changed, 142 insertions, 0 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 new file mode 100644 index 0000000..d3b165a --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch | |||
@@ -0,0 +1,142 @@ | |||
1 | From 90d017563e2d030a8fbeb31eca294d342a8559de Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Mon, 13 Aug 2018 16:45:24 +0100 | ||
4 | Subject: [PATCH 1005/1013] hotspot: Zero build requires disabled warnings | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | |# HG changeset patch | ||
10 | |# User sgehwolf | ||
11 | |# Date 1525714161 -3600 | ||
12 | |# Mon May 07 18:29:21 2018 +0100 | ||
13 | |# Node ID afb31413c73cbc06420fdb447aa90a7a38258904 | ||
14 | |# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60 | ||
15 | 8143245, PR3548: Zero build requires disabled warnings | ||
16 | Reviewed-by: dholmes, coleenp | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
22 | --- | ||
23 | src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- | ||
24 | src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- | ||
25 | src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++-- | ||
26 | src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- | ||
27 | 4 files changed, 17 insertions(+), 6 deletions(-) | ||
28 | |||
29 | 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 | --- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | ||
32 | +++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | ||
33 | @@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { | ||
34 | case T_DOUBLE: | ||
35 | case T_VOID: | ||
36 | return result; | ||
37 | - default : ShouldNotReachHere(); | ||
38 | + default : ShouldNotReachHere(); return NULL_WORD; | ||
39 | } | ||
40 | } | ||
41 | |||
42 | 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 | --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | ||
45 | +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | ||
46 | @@ -1,5 +1,5 @@ | ||
47 | /* | ||
48 | - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. | ||
49 | + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. | ||
50 | * Copyright 2007, 2008, 2010 Red Hat, Inc. | ||
51 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
52 | * | ||
53 | @@ -62,7 +62,7 @@ void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_object() { | ||
54 | } | ||
55 | |||
56 | void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) { | ||
57 | - ffi_type *ftype; | ||
58 | + ffi_type *ftype = NULL; | ||
59 | switch (type) { | ||
60 | case T_VOID: | ||
61 | 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 | index d22ea1141..cbee43baa 100644 | ||
64 | --- 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 | @@ -61,6 +61,7 @@ address os::current_stack_pointer() { | ||
67 | |||
68 | frame os::get_sender_for_C_frame(frame* fr) { | ||
69 | ShouldNotCallThis(); | ||
70 | + return frame(NULL, NULL); // silence compile warning. | ||
71 | } | ||
72 | |||
73 | frame os::current_frame() { | ||
74 | @@ -98,16 +99,19 @@ void os::initialize_thread(Thread * thr){ | ||
75 | |||
76 | address os::Linux::ucontext_get_pc(ucontext_t* uc) { | ||
77 | ShouldNotCallThis(); | ||
78 | + return NULL; // silence compile warnings | ||
79 | } | ||
80 | |||
81 | ExtendedPC os::fetch_frame_from_context(void* ucVoid, | ||
82 | intptr_t** ret_sp, | ||
83 | intptr_t** ret_fp) { | ||
84 | ShouldNotCallThis(); | ||
85 | + return NULL; // silence compile warnings | ||
86 | } | ||
87 | |||
88 | frame os::fetch_frame_from_context(void* ucVoid) { | ||
89 | ShouldNotCallThis(); | ||
90 | + return frame(NULL, NULL); // silence compile warnings | ||
91 | } | ||
92 | |||
93 | extern "C" JNIEXPORT int | ||
94 | @@ -247,11 +251,16 @@ JVM_handle_linux_signal(int sig, | ||
95 | } | ||
96 | #endif // !PRODUCT | ||
97 | |||
98 | - const char *fmt = "caught unhandled signal %d"; | ||
99 | char buf[64]; | ||
100 | |||
101 | - sprintf(buf, fmt, sig); | ||
102 | + sprintf(buf, "caught unhandled signal %d", sig); | ||
103 | + | ||
104 | +// Silence -Wformat-security warning for fatal() | ||
105 | +PRAGMA_DIAG_PUSH | ||
106 | +PRAGMA_FORMAT_NONLITERAL_IGNORED | ||
107 | fatal(buf); | ||
108 | +PRAGMA_DIAG_POP | ||
109 | + return true; // silence compiler warnings | ||
110 | } | ||
111 | |||
112 | void os::Linux::init_thread_fpu_state(void) { | ||
113 | @@ -260,6 +269,7 @@ void os::Linux::init_thread_fpu_state(void) { | ||
114 | |||
115 | int os::Linux::get_fpu_control_word() { | ||
116 | ShouldNotCallThis(); | ||
117 | + return -1; // silence compile warnings | ||
118 | } | ||
119 | |||
120 | 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 | index 94bc83a30..b3ba526f2 100644 | ||
123 | --- 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 | @@ -1,5 +1,5 @@ | ||
126 | /* | ||
127 | - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. | ||
128 | + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. | ||
129 | * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. | ||
130 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
131 | * | ||
132 | @@ -110,6 +110,7 @@ | ||
133 | void* ucontext, | ||
134 | bool isInJava) { | ||
135 | ShouldNotCallThis(); | ||
136 | + return false; // silence compile warning | ||
137 | } | ||
138 | |||
139 | bool pd_get_top_frame_for_profiling(frame* fr_addr, | ||
140 | -- | ||
141 | 2.26.2 | ||
142 | |||