summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-30 15:35:59 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-01-28 15:09:31 +0100
commit7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.tar.gz
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build" version the recipes are adapted to use those "ga" versions. All existing patches got re-applied and renamed. For better handling Hotspot patches now start at patch number 1001 and jdk patches at 2001. Furthermore architecture dependent patches are prefixed with the architecture they apply on. Following patches/hunks were completely dropped: - 0002-hotspot-fix-compilation-with-security-flags-enabled.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185 - 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch ostream.cpp:112 got fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502 - 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 - 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd - 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c - openjdk8-add-missing-linker-flags.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a - openjdk8-fix-shark-stdc++11.patch fixed in hotspot jdk8u - openjdk8-fix-libpng-neon-build.patch fixed in jdk https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1 - aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u Following patches were newly added: - 0011-autoconf-fix-CC-with-arguments-detection.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" - 0012-autoconf-NativeCompilation-remove-sysroot.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" Additionally add UPDATING.md which describes the openjdk8 update process for this layer and update8checksums.sh, a script that updates the openjdk8 source archive checksums in the corresponding .inc files. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch142
1 files changed, 142 insertions, 0 deletions
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
new file mode 100644
index 0000000..38067cb
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch
@@ -0,0 +1,142 @@
1From 84fc6448f44cd45a5448d0e88df8ccabfa10dcc5 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:45:24 +0100
4Subject: [PATCH 1006/1012] hotspot: Zero build requires disabled warnings
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-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
158143245, PR3548: Zero build requires disabled warnings
16Reviewed-by: dholmes, coleenp
17
18Upstream-Status: Backport
19
20Signed-off-by: André Draszik <andre.draszik@jci.com>
21Signed-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
29diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
30index 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
42diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
43index 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;
62diff --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
63index 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) {
121diff --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
122index 39f77f858..b9c73dc48 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 // These routines are only used on cpu architectures that
140--
1412.24.1
142