diff options
| author | Richard Leitner <richard.leitner@skidata.com> | 2019-12-27 11:12:19 +0100 |
|---|---|---|
| committer | Richard Leitner <richard.leitner@skidata.com> | 2019-12-27 11:29:58 +0100 |
| commit | 1f00d6d7f75c8085fcce1cedfcf8588541f2a073 (patch) | |
| tree | 0ffcae03ca717b650a33626a3059d583ee5e66fd | |
| parent | d2e962a795e8713e5443659669842298453d938f (diff) | |
| download | meta-java-1f00d6d7f75c8085fcce1cedfcf8588541f2a073.tar.gz meta-java-1f00d6d7f75c8085fcce1cedfcf8588541f2a073.tar.bz2 meta-java-1f00d6d7f75c8085fcce1cedfcf8588541f2a073.zip | |
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.patch | 20 | ||||
| -rw-r--r-- | recipes-core/icedtea/openjdk-7-release-03b147.inc | 2 |
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 @@ +--- openjdk/hotspot/src/share/vm/code/relocInfo.hpp ++++ openjdk/hotspot/src/share/vm/code/relocInfo.hpp +@@ -371,7 +371,7 @@ + // "immediate" in the prefix header word itself. This optimization + // is invisible outside this module.) + +- inline friend relocInfo prefix_relocInfo(int datalen = 0); ++ inline friend relocInfo prefix_relocInfo(int datalen); + + protected: + // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value +@@ -466,7 +466,7 @@ + return relocInfo(relocInfo::none, relocInfo::offset_limit() - relocInfo::offset_unit); + } + +-inline relocInfo prefix_relocInfo(int datalen) { ++inline relocInfo prefix_relocInfo(int datalen = 0) { + assert(relocInfo::fits_into_immediate(datalen), "datalen in limits"); + return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen); + } 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 = " \ file://icedtea-CVE-2014-1876-unpack.patch;apply=no \ file://icedtea-jdk-unzip.patch;apply=no \ file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \ + file://icedtea-hotspot-fix-prefix_relocInfo-declaration.patch;apply=no \ " OPENJDK_HEADLESS_PATCHES = " \ @@ -113,6 +114,7 @@ export DISTRIBUTION_PATCHES = " \ patches/icedtea-CVE-2014-1876-unpack.patch \ patches/icedtea-jdk-unzip.patch \ patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \ + patches/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch \ ${CLEAN_X11_DISTRIBUTION_PATCH} \ " |