diff options
| -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 @@ | |||
| 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 | ||
| 95 | OPENJDK_HEADLESS_PATCHES = " \ | 96 | OPENJDK_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 | ||
