summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0016-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/0016-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/0016-hotspot-Zero-build-requires-disabled-warnings.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch148
1 files changed, 0 insertions, 148 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch
deleted file mode 100644
index d6bedbc..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1From 43c1f744e5f6171df3158baf88dd0a64c4b5e439 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 2/5] 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
18Signed-off-by: André Draszik <andre.draszik@jci.com>
19Upstream-Status: Backport
20---
21 hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +-
22 hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++--
23 .../src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 16 +++++++++++++---
24 .../os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++-
25 4 files changed, 18 insertions(+), 7 deletions(-)
26
27diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
28index 242ce1cf..065471af 100644
29--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
30+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
31@@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) {
32 case T_DOUBLE:
33 case T_VOID:
34 return result;
35- default : ShouldNotReachHere();
36+ default : ShouldNotReachHere(); return NULL_WORD;
37 }
38 }
39
40diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
41index e23e3eaa..061ed8ce 100644
42--- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
43+++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
44@@ -1,5 +1,5 @@
45 /*
46- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
47+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
48 * Copyright 2007, 2008, 2010 Red Hat, Inc.
49 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
50 *
51@@ -62,7 +62,7 @@ void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_object() {
52 }
53
54 void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
55- ffi_type *ftype;
56+ ffi_type *ftype = NULL;
57 switch (type) {
58 case T_VOID:
59 ftype = &ffi_type_void;
60diff --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
61index 8dcf9d44..508eb172 100644
62--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
63+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
64@@ -1,6 +1,6 @@
65 /*
66 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
67- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
68+ * Copyright 2016 Red Hat, Inc.
69 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
70 *
71 * This code is free software; you can redistribute it and/or modify it
72@@ -61,6 +61,7 @@ address os::current_stack_pointer() {
73
74 frame os::get_sender_for_C_frame(frame* fr) {
75 ShouldNotCallThis();
76+ return frame(NULL, NULL); // silence compile warning.
77 }
78
79 frame os::current_frame() {
80@@ -98,16 +99,19 @@ void os::initialize_thread(Thread * thr){
81
82 address os::Linux::ucontext_get_pc(ucontext_t* uc) {
83 ShouldNotCallThis();
84+ return NULL; // silence compile warnings
85 }
86
87 ExtendedPC os::fetch_frame_from_context(void* ucVoid,
88 intptr_t** ret_sp,
89 intptr_t** ret_fp) {
90 ShouldNotCallThis();
91+ return NULL; // silence compile warnings
92 }
93
94 frame os::fetch_frame_from_context(void* ucVoid) {
95 ShouldNotCallThis();
96+ return frame(NULL, NULL); // silence compile warnings
97 }
98
99 extern "C" JNIEXPORT int
100@@ -247,11 +251,16 @@ JVM_handle_linux_signal(int sig,
101 }
102 #endif // !PRODUCT
103
104- const char *fmt = "caught unhandled signal %d";
105 char buf[64];
106
107- sprintf(buf, fmt, sig);
108+ sprintf(buf, "caught unhandled signal %d", sig);
109+
110+// Silence -Wformat-security warning for fatal()
111+PRAGMA_DIAG_PUSH
112+PRAGMA_FORMAT_NONLITERAL_IGNORED
113 fatal(buf);
114+PRAGMA_DIAG_POP
115+ return true; // silence compiler warnings
116 }
117
118 void os::Linux::init_thread_fpu_state(void) {
119@@ -260,6 +269,7 @@ void os::Linux::init_thread_fpu_state(void) {
120
121 int os::Linux::get_fpu_control_word() {
122 ShouldNotCallThis();
123+ return -1; // silence compile warnings
124 }
125
126 void os::Linux::set_fpu_control_word(int fpu) {
127diff --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
128index 39f77f85..b9c73dc4 100644
129--- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
130+++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
131@@ -1,5 +1,5 @@
132 /*
133- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
134+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
135 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
136 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
137 *
138@@ -110,6 +110,7 @@
139 void* ucontext,
140 bool isInJava) {
141 ShouldNotCallThis();
142+ return false; // silence compile warning
143 }
144
145 // These routines are only used on cpu architectures that
146--
1472.18.0
148