diff options
author | André Draszik <andre.draszik@jci.com> | 2018-03-06 10:54:20 +0200 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-03-06 10:56:44 +0200 |
commit | ad72b21676a99417605c5b7e6d068ad81142f7b2 (patch) | |
tree | 94e8665f5dce93e84b2e6e4bb22e5c1d640d3e69 /recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch | |
parent | 55eab1f99a485089966a29771c43486299095a48 (diff) | |
download | meta-java-ad72b21676a99417605c5b7e6d068ad81142f7b2.tar.gz |
openjdk-8: add patch for compiling with enabled security flags
Rather than carrying an OE specific patch that just silences the
warning on some platform only, backport the upstream patch
to actually fix the issue.
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch b/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch new file mode 100644 index 0000000..075a638 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From bdea8cf299313388ec41ea20281deca6dc4f764d Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
3 | Date: Tue, 27 Feb 2018 14:41:06 +0000 | ||
4 | Subject: [PATCH 2/8] hotspot: fix compilation with security flags enabled | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | | hotspot/src/share/vm/code/dependencies.cpp: In function 'static void Dependencies::write_dependency_to(xmlStream*, Dependencies::DepType, GrowableArray<Dependencies::DepArgument>*, Klass*)': | ||
10 | | hotspot/src/share/vm/code/dependencies.cpp:498:6: error: '%d' directive writing between 1 and 10 bytes into a region of size 9 [-Werror=format-overflow=] | ||
11 | | void Dependencies::write_dependency_to(xmlStream* xtty, | ||
12 | | ^~~~~~~~~~~~ | ||
13 | | hotspot/src/share/vm/code/dependencies.cpp:498:6: note: directive argument in the range [0, 2147483647] | ||
14 | | hotspot/src/share/vm/code/dependencies.cpp:528:27: note: 'sprintf' output between 3 and 12 bytes into a destination of size 10 | ||
15 | | char xn[10]; sprintf(xn, "x%d", j); | ||
16 | | ~~~~~~~^~~~~~~~~~~~~~ | ||
17 | |||
18 | Backport a patch to fix this. | ||
19 | |||
20 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk10/jdk10/hotspot/rev/eb11b3f0ae65] | ||
21 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
22 | --- | ||
23 | hotspot/src/share/vm/code/dependencies.cpp | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/hotspot/src/share/vm/code/dependencies.cpp b/hotspot/src/share/vm/code/dependencies.cpp | ||
27 | index 7317036d..c71d921d 100644 | ||
28 | --- a/hotspot/src/share/vm/code/dependencies.cpp | ||
29 | +++ b/hotspot/src/share/vm/code/dependencies.cpp | ||
30 | @@ -525,7 +525,7 @@ void Dependencies::write_dependency_to(xmlStream* xtty, | ||
31 | xtty->object("x", arg.metadata_value()); | ||
32 | } | ||
33 | } else { | ||
34 | - char xn[10]; sprintf(xn, "x%d", j); | ||
35 | + char xn[12]; sprintf(xn, "x%d", j); | ||
36 | if (arg.is_oop()) { | ||
37 | xtty->object(xn, arg.oop_value()); | ||
38 | } else { | ||
39 | -- | ||
40 | 2.16.2 | ||
41 | |||