summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-27 11:12:19 +0100
committerRichard Leitner <richard.leitner@skidata.com>2019-12-27 11:29:58 +0100
commit1f00d6d7f75c8085fcce1cedfcf8588541f2a073 (patch)
tree0ffcae03ca717b650a33626a3059d583ee5e66fd
parentd2e962a795e8713e5443659669842298453d938f (diff)
downloadmeta-java-1f00d6d7f75c8085fcce1cedfcf8588541f2a073.tar.gz
icedtea7-native: add patch to fix friend declaration of prefix_relocInfo
This fixes the following error: build/openjdk-boot/hotspot/src/share/vm/code/relocInfo.hpp:374:27: error: friend declaration of ‘relocInfo prefix_relocInfo(int)’ specifies default arguments and isn’t a definition [-fpermissive] Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch20
-rw-r--r--recipes-core/icedtea/openjdk-7-release-03b147.inc2
2 files changed, 22 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch
new file mode 100644
index 0000000..bd2819f
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch
@@ -0,0 +1,20 @@
1--- openjdk/hotspot/src/share/vm/code/relocInfo.hpp
2+++ openjdk/hotspot/src/share/vm/code/relocInfo.hpp
3@@ -371,7 +371,7 @@
4 // "immediate" in the prefix header word itself. This optimization
5 // is invisible outside this module.)
6
7- inline friend relocInfo prefix_relocInfo(int datalen = 0);
8+ inline friend relocInfo prefix_relocInfo(int datalen);
9
10 protected:
11 // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value
12@@ -466,7 +466,7 @@
13 return relocInfo(relocInfo::none, relocInfo::offset_limit() - relocInfo::offset_unit);
14 }
15
16-inline relocInfo prefix_relocInfo(int datalen) {
17+inline relocInfo prefix_relocInfo(int datalen = 0) {
18 assert(relocInfo::fits_into_immediate(datalen), "datalen in limits");
19 return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen);
20 }
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index 484f124..2bc7065 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -90,6 +90,7 @@ OPENJDK_PATCHES = " \
90 file://icedtea-CVE-2014-1876-unpack.patch;apply=no \ 90 file://icedtea-CVE-2014-1876-unpack.patch;apply=no \
91 file://icedtea-jdk-unzip.patch;apply=no \ 91 file://icedtea-jdk-unzip.patch;apply=no \
92 file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \ 92 file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \
93 file://icedtea-hotspot-fix-prefix_relocInfo-declaration.patch;apply=no \
93 " 94 "
94 95
95OPENJDK_HEADLESS_PATCHES = " \ 96OPENJDK_HEADLESS_PATCHES = " \
@@ -113,6 +114,7 @@ export DISTRIBUTION_PATCHES = " \
113 patches/icedtea-CVE-2014-1876-unpack.patch \ 114 patches/icedtea-CVE-2014-1876-unpack.patch \
114 patches/icedtea-jdk-unzip.patch \ 115 patches/icedtea-jdk-unzip.patch \
115 patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \ 116 patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \
117 patches/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch \
116 ${CLEAN_X11_DISTRIBUTION_PATCH} \ 118 ${CLEAN_X11_DISTRIBUTION_PATCH} \
117 " 119 "
118 120