diff options
Diffstat (limited to 'recipes-core/openjdk')
67 files changed, 1292 insertions, 4018 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 1fbe7fe..0ef4750 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -8,13 +8,13 @@ require openjdk-common.inc | |||
8 | 8 | ||
9 | AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" | 9 | AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" |
10 | export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" | 10 | export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" |
11 | |||
12 | FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:" | 11 | FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:" |
13 | 12 | ||
14 | # for weird openjdk-common.inc | 13 | # for weird openjdk-common.inc |
15 | S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}" | 14 | S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}" |
15 | export TOPDIR="${S}" | ||
16 | 16 | ||
17 | SRC_URI = " \ | 17 | SRC_URI = "\ |
18 | ${OPENJDK_URI} \ | 18 | ${OPENJDK_URI} \ |
19 | ${HOTSPOT_URI} \ | 19 | ${HOTSPOT_URI} \ |
20 | ${CORBA_URI} \ | 20 | ${CORBA_URI} \ |
@@ -155,16 +155,12 @@ def jdk_configure_options(d): | |||
155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" | 155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" |
156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" | 156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" |
157 | 157 | ||
158 | do_configure_prepend() { | ||
159 | export ${@jdk_environment_options(d)} | ||
160 | } | ||
161 | |||
162 | export DEBUG_BINARIES = "true" | 158 | export DEBUG_BINARIES = "true" |
163 | 159 | ||
164 | ALTERNATIVE_PRIORITY = "50" | 160 | ALTERNATIVE_PRIORITY = "50" |
165 | 161 | ||
166 | OPENJDK_UPDATE_VERSION = "${@d.getVar('PV').split('b')[0]}" | 162 | OPENJDK_UPDATE_VERSION = "${PV}" |
167 | OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV').split('b')[1]}" | 163 | OPENJDK_BUILD_NUMBER = "ga" |
168 | EXTRA_OECONF_append = "\ | 164 | EXTRA_OECONF_append = "\ |
169 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ | 165 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ |
170 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ | 166 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ |
@@ -176,6 +172,7 @@ EXTRA_OECONF_append = "\ | |||
176 | FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" | 172 | FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" |
177 | FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" | 173 | FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" |
178 | FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" | 174 | FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" |
175 | FLAGS_GCC9 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" | ||
179 | 176 | ||
180 | # flags for -native, and for bits that need a host-tool during -cross | 177 | # flags for -native, and for bits that need a host-tool during -cross |
181 | BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}" | 178 | BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}" |
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 18b99fd..6c0f949 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -13,6 +13,7 @@ PRIVATE_LIBS = "\ | |||
13 | libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \ | 13 | libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \ |
14 | libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \ | 14 | libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \ |
15 | libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \ | 15 | libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \ |
16 | libfreetype.so.6 \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | PACKAGECONFIG ??= " \ | 19 | PACKAGECONFIG ??= " \ |
@@ -42,23 +43,22 @@ PACKAGECONFIG[repack] = ",,," | |||
42 | 43 | ||
43 | PACKAGECONFIG[kerberos] = ",,krb5" | 44 | PACKAGECONFIG[kerberos] = ",,krb5" |
44 | 45 | ||
45 | CACHED_CONFIGUREVARS = " \ | ||
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_includes=${STAGING_INCDIR}', '', d)} \ | ||
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_libraries=${STAGING_LIBDIR}', '', d)} \ | ||
48 | " | ||
49 | |||
50 | require openjdk-8-common.inc | 46 | require openjdk-8-common.inc |
51 | 47 | ||
52 | JAVA_HOME[unexport] = "1" | 48 | JAVA_HOME[unexport] = "1" |
53 | 49 | ||
54 | SRC_URI_append = "\ | 50 | SRC_URI_append = "\ |
55 | file://jvm.cfg \ | 51 | file://jvm.cfg \ |
52 | file://0011-autoconf-fix-CC-with-arguments-detection.patch \ | ||
53 | file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ | ||
56 | " | 54 | " |
57 | 55 | ||
56 | BUILD_CFLAGS_append = " -Wno-stringop-overflow -Wno-error" | ||
57 | TARGET_CFLAGS_append = " -Wno-stringop-overflow -Wno-error" | ||
58 | |||
58 | EXTRA_OECONF_append = "\ | 59 | EXTRA_OECONF_append = "\ |
59 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ | 60 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ |
60 | \ | 61 | \ |
61 | --with-sys-root=${STAGING_DIR_HOST} \ | ||
62 | --with-tools-dir=${STAGING_DIR_NATIVE} \ | 62 | --with-tools-dir=${STAGING_DIR_NATIVE} \ |
63 | --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ | 63 | --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ |
64 | --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \ | 64 | --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \ |
@@ -66,13 +66,21 @@ EXTRA_OECONF_append = "\ | |||
66 | --disable-precompiled-headers \ | 66 | --disable-precompiled-headers \ |
67 | --disable-zip-debug-info \ | 67 | --disable-zip-debug-info \ |
68 | \ | 68 | \ |
69 | --with-sys-root=${STAGING_DIR_HOST} \ | ||
69 | --with-extra-cflags='${CFLAGS}' \ | 70 | --with-extra-cflags='${CFLAGS}' \ |
70 | --with-extra-cxxflags='${CXXFLAGS}' \ | 71 | --with-extra-cxxflags='${CXXFLAGS}' \ |
71 | --with-extra-ldflags='${LDFLAGS}' \ | 72 | --with-extra-ldflags='${LDFLAGS}' \ |
73 | --with-freetype-include=${STAGING_INCDIR}/freetype2 \ | ||
74 | --with-freetype-lib=${STAGING_LIBDIR} \ | ||
72 | \ | 75 | \ |
73 | ${@jdk_configure_options(d)} \ | 76 | ${@jdk_configure_options(d)} \ |
74 | " | 77 | " |
75 | 78 | ||
79 | do_configure_prepend() { | ||
80 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | ||
81 | export ${@jdk_environment_options(d)} | ||
82 | } | ||
83 | |||
76 | do_configure_append() { | 84 | do_configure_append() { |
77 | sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk | 85 | sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk |
78 | } | 86 | } |
@@ -97,8 +105,6 @@ do_install_append() { | |||
97 | export MAKE_VERBOSE = "y" | 105 | export MAKE_VERBOSE = "y" |
98 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" | 106 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" |
99 | 107 | ||
100 | BUILD_LD="${BUILD_CCLD}" | ||
101 | |||
102 | EXTRA_OEMAKE_append = '\ | 108 | EXTRA_OEMAKE_append = '\ |
103 | ${@jdk_make_options(d)} \ | 109 | ${@jdk_make_options(d)} \ |
104 | ALT_SDT_H="${STAGING_INCDIR}" \ | 110 | ALT_SDT_H="${STAGING_INCDIR}" \ |
@@ -125,5 +131,6 @@ python remove_debuglink() { | |||
125 | 131 | ||
126 | PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" | 132 | PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" |
127 | 133 | ||
128 | # There is a symlink to a .so but this one is valid. | 134 | # FIXME libjsig.so is a symlink to a .so but this one is valid |
129 | INSANE_SKIP_${PN} = "dev-so" | 135 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped |
136 | INSANE_SKIP_${PN} = "dev-so already-stripped" | ||
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index bae5d09..321a43d 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc | |||
@@ -20,12 +20,13 @@ PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" | |||
20 | EXTRA_OECONF_append = "\ | 20 | EXTRA_OECONF_append = "\ |
21 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ | 21 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ |
22 | \ | 22 | \ |
23 | --with-sys-root=${STAGING_DIR_NATIVE} \ | ||
24 | --with-tools-dir=${STAGING_DIR_NATIVE} \ | 23 | --with-tools-dir=${STAGING_DIR_NATIVE} \ |
25 | --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native \ | 24 | --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native \ |
26 | --with-extra-cflags='${CFLAGS}' \ | 25 | --with-extra-cflags='${CFLAGS}' \ |
27 | --with-extra-cxxflags='${CXXFLAGS}' \ | 26 | --with-extra-cxxflags='${CXXFLAGS}' \ |
28 | --with-extra-ldflags='${LDFLAGS}' \ | 27 | --with-extra-ldflags='${LDFLAGS}' \ |
28 | --with-freetype-include=${STAGING_INCDIR_NATIVE}/freetype2 \ | ||
29 | --with-freetype-lib=${STAGING_LIBDIR_NATIVE} \ | ||
29 | --with-stdc++lib=dynamic \ | 30 | --with-stdc++lib=dynamic \ |
30 | ${@jdk_configure_options(d)} \ | 31 | ${@jdk_configure_options(d)} \ |
31 | " | 32 | " |
@@ -51,6 +52,8 @@ EXTRA_OEMAKE_append = ' \ | |||
51 | 52 | ||
52 | do_configure_prepend() { | 53 | do_configure_prepend() { |
53 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | 54 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" |
55 | export ${@jdk_environment_options(d)} | ||
56 | unset CC CXX | ||
54 | } | 57 | } |
55 | 58 | ||
56 | do_compile_prepend() { | 59 | do_compile_prepend() { |
diff --git a/recipes-core/openjdk/openjdk-8-native_172b11.bb b/recipes-core/openjdk/openjdk-8-native_172b11.bb deleted file mode 100644 index e7eb21c..0000000 --- a/recipes-core/openjdk/openjdk-8-native_172b11.bb +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | require openjdk-8-release-${PV}.inc | ||
2 | require openjdk-8-native.inc | ||
diff --git a/recipes-core/openjdk/openjdk-8-native_242.bb b/recipes-core/openjdk/openjdk-8-native_242.bb new file mode 100644 index 0000000..39321f2 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-native_242.bb | |||
@@ -0,0 +1,2 @@ | |||
1 | require openjdk-8-release.inc | ||
2 | require openjdk-8-native.inc | ||
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc deleted file mode 100644 index 9cc2083..0000000 --- a/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | require openjdk-8-release-172b11-common.inc | ||
2 | |||
3 | COMPATIBLE_HOST = "^$" | ||
4 | COMPATIBLE_HOST_armv7a = "arm" | ||
5 | COMPATIBLE_HOST_armv7ve = "arm" | ||
6 | |||
7 | CORBA_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
8 | SRC_URI[corba.md5sum] = "557b94847d8fade14c048cb0a96ed035" | ||
9 | SRC_URI[corba.sha256sum] = "366fa9aaf11d75f74e8c6bdf9cab9214cf66b0eac1ca40f2789b3ba442929708" | ||
10 | |||
11 | HOTSPOT_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
12 | SRC_URI[hotspot.md5sum] = "37d796794234f38fa71339ba78368b80" | ||
13 | SRC_URI[hotspot.sha256sum] = "5f89f8ba9a099a2d84b4ca6bd49553ce4efe1b29d55de9134809b7b59b6c9ce3" | ||
14 | |||
15 | JAXP_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
16 | SRC_URI[jaxp.md5sum] = "2dc311a7c0d6483226cdc5e501b1f8d0" | ||
17 | SRC_URI[jaxp.sha256sum] = "f62db09a41213b5b5d1886c1aeabe43def09235de1d60af518213b9acea4fdca" | ||
18 | |||
19 | JAXWS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
20 | SRC_URI[jaxws.md5sum] = "fbd81e288d1ee5df631f213c130f21bb" | ||
21 | SRC_URI[jaxws.sha256sum] = "bac66e848ee48c6fef6130db4bb6879dbd64c550c1f42e4676ab6a2c3ee4fab8" | ||
22 | |||
23 | JDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
24 | SRC_URI[jdk.md5sum] = "b8003e6f1714617461f3eb7ee8b1efee" | ||
25 | SRC_URI[jdk.sha256sum] = "0a7eef6fef2b457bef3bd1d24031234bbb9d74a5fca2f65e1603278cd9d393a0" | ||
26 | |||
27 | LANGTOOLS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
28 | SRC_URI[langtools.md5sum] = "e38f50b0113b3a956ac4917720655e93" | ||
29 | SRC_URI[langtools.sha256sum] = "9ca88fcfe5a07861de693ff3b38d03f063a7937576cd93116ea6b4a4bd7894d5" | ||
30 | |||
31 | NASHORN_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
32 | SRC_URI[nashorn.md5sum] = "c191cc92996fcb271254fc0a4f3eb7c9" | ||
33 | SRC_URI[nashorn.sha256sum] = "853bb3162fefa989fa0c31848cb990d8e5698ccd8a2a336dbf98bde35eb5241d" | ||
34 | |||
35 | OPENJDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
36 | SRC_URI[openjdk.md5sum] = "25398ccf25633a878dca54a8d606e48e" | ||
37 | SRC_URI[openjdk.sha256sum] = "8c8e515ebcceded4b90187b4bdaf129b63ae6e64ddfe4f05a60df0694235b9e7" | ||
38 | |||
39 | PACKAGECONFIG_append_armv7a = " client" | ||
40 | PACKAGECONFIG_append_armv7ve = " client" | ||
41 | |||
42 | do_install_append() { | ||
43 | if [ -d ${D}${JDK_HOME} ] ; then | ||
44 | sed -e 's,^\(-server ERROR$\),# \1,' \ | ||
45 | -e 's,^-client IGNORE,-client ERROR,' \ | ||
46 | -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ | ||
47 | -i ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | ||
48 | fi | ||
49 | if [ -d ${D}${JRE_HOME} ] ; then | ||
50 | sed -e 's,^\(-server ERROR$\),# \1,' \ | ||
51 | -e 's,^-client IGNORE,-client ERROR,' \ | ||
52 | -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ | ||
53 | -i ${D}${JRE_HOME}/lib/${JDK_ARCH}/jvm.cfg | ||
54 | fi | ||
55 | } | ||
56 | |||
57 | JDK_ARCH_armv7a = "aarch32" | ||
58 | JDK_ARCH_armv7ve = "aarch32" | ||
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc b/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc deleted file mode 100644 index f0f4655..0000000 --- a/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | require openjdk-8-release-172b11-common.inc | ||
2 | |||
3 | COMPATIBLE_HOST = "aarch64" | ||
4 | |||
5 | CORBA_CHANGESET_aarch64 = "3a04a7c080af" | ||
6 | SRC_URI[corba.md5sum] = "758b29d6cf714fd894df8674afd78e17" | ||
7 | SRC_URI[corba.sha256sum] = "564113dbeadc57ac5831ccc056e0b920adbd3b74558cf750aa899f5de25ceb5e" | ||
8 | |||
9 | HOTSPOT_CHANGESET_aarch64 = "1ced2ae00e35" | ||
10 | SRC_URI[hotspot.md5sum] = "1db8a0e5e63352f1743e9d41ab6ed5cf" | ||
11 | SRC_URI[hotspot.sha256sum] = "6993c3138035a7c0d2782b1ca7aabdb43452b1abbcc60448042f5c9207b03ab5" | ||
12 | |||
13 | JAXP_CHANGESET_aarch64 = "ab8087f496fe" | ||
14 | SRC_URI[jaxp.md5sum] = "0e7d8755af72aaf9ec7521514d8bb541" | ||
15 | SRC_URI[jaxp.sha256sum] = "6e70c1535d738dc2c4e3a2fb9e6e11c660172b6d2ce905ec33e8924f8c208978" | ||
16 | |||
17 | JAXWS_CHANGESET_aarch64 = "1e71aeefeecf" | ||
18 | SRC_URI[jaxws.md5sum] = "16ff9ba1007aee21ad3df472b1f5c55e" | ||
19 | SRC_URI[jaxws.sha256sum] = "b6ccb2855c2e9cd5778b193b5ad47f2e13496cbbbad74497c70216cd04b4c7dc" | ||
20 | |||
21 | JDK_CHANGESET_aarch64 = "e8e6553e7ca9" | ||
22 | SRC_URI[jdk.md5sum] = "52b35732c17e9048e506b7b46c1282f8" | ||
23 | SRC_URI[jdk.sha256sum] = "ffaa79dad3b126af77ac9c230c54805b224c5d6517830a37c7272678407c99da" | ||
24 | |||
25 | LANGTOOLS_CHANGESET_aarch64 = "14d381cbe563" | ||
26 | SRC_URI[langtools.md5sum] = "d14425cc0334ed46ce695c9930bff6d5" | ||
27 | SRC_URI[langtools.sha256sum] = "a4334c8859fe48bf2eae3b076785ff2e36a5ae80cf5840aef32731c3099a2274" | ||
28 | |||
29 | NASHORN_CHANGESET_aarch64 = "c667b467b394" | ||
30 | SRC_URI[nashorn.md5sum] = "0389c953bdd14c804d873d95ff4b3033" | ||
31 | SRC_URI[nashorn.sha256sum] = "7cd87e641f0781481635593c144c8030f20d97cfc048ca57bd56381bab8e7d92" | ||
32 | |||
33 | OPENJDK_CHANGESET_aarch64 = "74564d40b0d6" | ||
34 | SRC_URI[openjdk.md5sum] = "13f7f15386f7aa0cc3383e9d1e98d2f1" | ||
35 | SRC_URI[openjdk.sha256sum] = "a6425e11700edcdc0761df9da75b28b48adc664f3d8259c49ced1c85af3dc502" | ||
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11.inc b/recipes-core/openjdk/openjdk-8-release-172b11.inc deleted file mode 100644 index b308e50..0000000 --- a/recipes-core/openjdk/openjdk-8-release-172b11.inc +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | require openjdk-8-release-172b11-common.inc | ||
2 | |||
3 | # We do not yet work for aarch64, and we make sure | ||
4 | # to use the aarch32 port for ARMv7. | ||
5 | COMPATIBLE_HOST = "^(?!(aarch64)).*$" | ||
6 | COMPATIBLE_HOST_armv7a = "^$" | ||
7 | COMPATIBLE_HOST_armv7ve = "^$" | ||
8 | |||
9 | CORBA_CHANGESET = "875a75c440cd" | ||
10 | SRC_URI[corba.md5sum] = "66242dd6e749f39a5ef6add34f5ecb2f" | ||
11 | SRC_URI[corba.sha256sum] = "f1618be7ad88619c7d7c1eed9800c528d0646e1c9f039e20a57b3e72ae3d3512" | ||
12 | |||
13 | HOTSPOT_CHANGESET = "32ba4d2121c1" | ||
14 | SRC_URI[hotspot.md5sum] = "a3e1d2f91ba8873f71e9a72043e2644a" | ||
15 | SRC_URI[hotspot.sha256sum] = "680b1f5100786910bfceeef90ce28d74fcf6eacfdd3b92dfc76dcf3216060e99" | ||
16 | |||
17 | JAXP_CHANGESET = "30586bb50743" | ||
18 | SRC_URI[jaxp.md5sum] = "b413b1cb709d74e513f13c586215366d" | ||
19 | SRC_URI[jaxp.sha256sum] = "ba36dd8ad72ff3d8bda38b7d6773037e18c3c68ebadd61f1e1f7fc167a506baa" | ||
20 | |||
21 | JAXWS_CHANGESET = "452a6a5a878e" | ||
22 | SRC_URI[jaxws.md5sum] = "5c3c4d1fec19398128cf818aef5486a9" | ||
23 | SRC_URI[jaxws.sha256sum] = "89aa34e6bc3410a85ea697aa4ae70c21f7099efdacef78a6e5a46747421e86f9" | ||
24 | |||
25 | JDK_CHANGESET = "5ccc572f4ffe" | ||
26 | SRC_URI[jdk.md5sum] = "29dd4772e3862193e56007a0bb0d6886" | ||
27 | SRC_URI[jdk.sha256sum] = "4d1758ceec155fcd2cd786f11071ed614947a9720373d704221d78ed98beadec" | ||
28 | |||
29 | LANGTOOLS_CHANGESET = "34ee52bc68a4" | ||
30 | SRC_URI[langtools.md5sum] = "b195802f2aaa5c95c06cc50021bb42a6" | ||
31 | SRC_URI[langtools.sha256sum] = "0403bd2c9a45e4c0dc2148907028e0cdfd087be512e6d6b3763a01411936663a" | ||
32 | |||
33 | NASHORN_CHANGESET = "7efd6152328e" | ||
34 | SRC_URI[nashorn.md5sum] = "3aa4b31fdbf330baf28194e21697b8d6" | ||
35 | SRC_URI[nashorn.sha256sum] = "8b5cbd29e9dbace477a57d7c07a127312dd3cf6b8e648b0b64026616d12c6862" | ||
36 | |||
37 | OPENJDK_CHANGESET = "33d274a7dda0" | ||
38 | SRC_URI[openjdk.md5sum] = "105f62e8f22a68b8c4151c68a447f76e" | ||
39 | SRC_URI[openjdk.sha256sum] = "bf49215fe1e43e6f110470c911fce32722c843e03efb68e40cc7a832eb80faea" | ||
diff --git a/recipes-core/openjdk/openjdk-8-release-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-aarch32.inc new file mode 100644 index 0000000..686b562 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-aarch32.inc | |||
@@ -0,0 +1,60 @@ | |||
1 | require openjdk-8-release-common.inc | ||
2 | |||
3 | COMPATIBLE_HOST = "^$" | ||
4 | COMPATIBLE_HOST_armv7a = "arm" | ||
5 | COMPATIBLE_HOST_armv7ve = "arm" | ||
6 | |||
7 | CHANGESET_ID="200120" | ||
8 | |||
9 | CORBA_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" | ||
10 | SRC_URI[corba.md5sum] = "2abf6d5394d9c5310af1e4ca6cec4355" | ||
11 | SRC_URI[corba.sha256sum] = "52e83dfa2fa4fcc8c71f3b2959cca2136099b9c575d3726148c02b9cf7d06324" | ||
12 | |||
13 | HOTSPOT_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" | ||
14 | SRC_URI[hotspot.md5sum] = "e252af6c20d6190e0613f39c6066e3cc" | ||
15 | SRC_URI[hotspot.sha256sum] = "bfff2ef23ee80acd73a0774e7011028c3598e75d2ee8b3271524ec8ea54801ae" | ||
16 | |||
17 | JAXP_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" | ||
18 | SRC_URI[jaxp.md5sum] = "56dc7a99589582b18bbbb5c4464022c8" | ||
19 | SRC_URI[jaxp.sha256sum] = "430e49ba485737c02312557f4deb8562853e58be19ed175ea63b396307f140ce" | ||
20 | |||
21 | JAXWS_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" | ||
22 | SRC_URI[jaxws.md5sum] = "2bbcba759f24f5dcec0c33cd62382e4f" | ||
23 | SRC_URI[jaxws.sha256sum] = "c350716ff8782cc311ca17450e2d198d707d3fb71de9dc3394df39766979559f" | ||
24 | |||
25 | JDK_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" | ||
26 | SRC_URI[jdk.md5sum] = "e17f3f4ea8a409e4a1b09a12b3b5309d" | ||
27 | SRC_URI[jdk.sha256sum] = "dfa4a7e7f8ab8daf34343b1c33544b6209e422c74d5be1dbbd8ef80e2365c8aa" | ||
28 | |||
29 | LANGTOOLS_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" | ||
30 | SRC_URI[langtools.md5sum] = "06ca78c1d4e058f277876f4e6177d9b0" | ||
31 | SRC_URI[langtools.sha256sum] = "59ccafa433f5510c91835efcafbe9ff9c707034ec3305dc3a4c1a85fac65ab0c" | ||
32 | |||
33 | NASHORN_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" | ||
34 | SRC_URI[nashorn.md5sum] = "1958e204f3984abeb2cf9e7c57aa7839" | ||
35 | SRC_URI[nashorn.sha256sum] = "e964721e539807a38bdcbce7259d235f873974a686badbc274b7368a288f0021" | ||
36 | |||
37 | OPENJDK_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" | ||
38 | SRC_URI[openjdk.md5sum] = "9aceb3b4cd710cdda55be4fe6a5303c9" | ||
39 | SRC_URI[openjdk.sha256sum] = "9691291b26a650d854ce0feacf32dfb3b956165c5d2db6e1ff46dd44f4c517cf" | ||
40 | |||
41 | PACKAGECONFIG_append_armv7a = " client" | ||
42 | PACKAGECONFIG_append_armv7ve = " client" | ||
43 | |||
44 | do_install_append() { | ||
45 | if [ -d ${D}${JDK_HOME} ] ; then | ||
46 | sed -e 's,^\(-server ERROR$\),# \1,' \ | ||
47 | -e 's,^-client IGNORE,-client ERROR,' \ | ||
48 | -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ | ||
49 | -i ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | ||
50 | fi | ||
51 | if [ -d ${D}${JRE_HOME} ] ; then | ||
52 | sed -e 's,^\(-server ERROR$\),# \1,' \ | ||
53 | -e 's,^-client IGNORE,-client ERROR,' \ | ||
54 | -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ | ||
55 | -i ${D}${JRE_HOME}/lib/${JDK_ARCH}/jvm.cfg | ||
56 | fi | ||
57 | } | ||
58 | |||
59 | JDK_ARCH_armv7a = "aarch32" | ||
60 | JDK_ARCH_armv7ve = "aarch32" | ||
diff --git a/recipes-core/openjdk/openjdk-8-release-aarch64.inc b/recipes-core/openjdk/openjdk-8-release-aarch64.inc new file mode 100644 index 0000000..d08892d --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-aarch64.inc | |||
@@ -0,0 +1,37 @@ | |||
1 | require openjdk-8-release-common.inc | ||
2 | |||
3 | COMPATIBLE_HOST = "aarch64" | ||
4 | |||
5 | CHANGESET_ID="b07" | ||
6 | |||
7 | CORBA_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | ||
8 | SRC_URI[corba.md5sum] = "d6dfd6f0c3bf4c6dc1f867dc7bcf8730" | ||
9 | SRC_URI[corba.sha256sum] = "e80dae94f21ca9de2269bc9de72f1098d417e9f7d6ff69d047e26669e31b1bc4" | ||
10 | |||
11 | HOTSPOT_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | ||
12 | SRC_URI[hotspot.md5sum] = "44731f82f6e2a0697f414ae62f9eff54" | ||
13 | SRC_URI[hotspot.sha256sum] = "3acb0bfa3eda0137e3c70ab10b59f139e0720116ed6ecf3f9c8633ebc36947b1" | ||
14 | |||
15 | JAXP_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | ||
16 | SRC_URI[jaxp.md5sum] = "7fb4207ba9277e109439101961223fc7" | ||
17 | SRC_URI[jaxp.sha256sum] = "22616e56825c611c70968c34a229661d4cb910fdb0c3936ae3c75de2330abfb5" | ||
18 | |||
19 | JAXWS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | ||
20 | SRC_URI[jaxws.md5sum] = "a27379cbd6253408eee4aa0b8a551042" | ||
21 | SRC_URI[jaxws.sha256sum] = "b6eb69d867694002284712a28058770170d885e6de6872cba260061d001b77ae" | ||
22 | |||
23 | JDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | ||
24 | SRC_URI[jdk.md5sum] = "2e64397ef1f35309aa7de00d46c2c751" | ||
25 | SRC_URI[jdk.sha256sum] = "d470d24eddc314e5c30035881f3af6f0c48a3360accc0644ec26d9d32d9ea0e6" | ||
26 | |||
27 | LANGTOOLS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | ||
28 | SRC_URI[langtools.md5sum] = "71c2ce819538b0acc443c0519dfa43c1" | ||
29 | SRC_URI[langtools.sha256sum] = "219919b7980d863cc26abd87341012f4802dd12a11a45f6627309ec365a9e838" | ||
30 | |||
31 | NASHORN_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | ||
32 | SRC_URI[nashorn.md5sum] = "6ee9418598ca411fe0b2339fa1a3a272" | ||
33 | SRC_URI[nashorn.sha256sum] = "6d86c23301d2cbc1ea72474730336e089eb4c3d3014bdf0f3a9d3b5976a75f58" | ||
34 | |||
35 | OPENJDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | ||
36 | SRC_URI[openjdk.md5sum] = "188b5d7ef0976cfc1a4258d1dc8ccce0" | ||
37 | SRC_URI[openjdk.sha256sum] = "7c32399a85f56bda2c740fc6834b8b5d648e75271a5376c2fa968bd713e3fec8" | ||
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc index f50b494..a8a653b 100644 --- a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc +++ b/recipes-core/openjdk/openjdk-8-release-common.inc | |||
@@ -1,61 +1,52 @@ | |||
1 | PATCHES_URI = "\ | 1 | PATCHES_URI = "\ |
2 | file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ | 2 | file://0001-Allow-using-a-system-installed-libjpeg.patch \ |
3 | file://filter-aclocal-copy-too.patch;striplevel=0 \ | 3 | file://0002-Allow-using-a-system-installed-libpng.patch \ |
4 | file://dont-expect-fqpn-for-make.patch;striplevel=0 \ | 4 | file://0003-build-fix-build-on-as-needed-toolchains-generic.patch \ |
5 | file://openjdk8-no-genx11-in-headless.patch;striplevel=0 \ | 5 | file://0004-don-t-expect-fqpn-for-make.patch \ |
6 | file://openjdk8-no-unused-deps.patch;striplevel=0 \ | 6 | file://0005-autoconf-filter-aclocal-copy-too.patch \ |
7 | file://openjdk8-find-compiler-fix-env-respect.patch;striplevel=0 \ | 7 | file://0006-autoconf-handle-extra-output.patch \ |
8 | file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;striplevel=0 \ | 8 | file://0007-fix-assembler-flag-handling-in-makefile.patch \ |
9 | file://0001-jdk-comparison-between-pointer-and-integer.patch \ | 9 | file://0008-autoconf-fix-shark-build-common.patch \ |
10 | file://0002-hotspot-fix-compilation-with-security-flags-enabled.patch \ | 10 | file://0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch \ |
11 | file://0003-jdk-Allow-using-a-system-installed-libjpeg.patch \ | 11 | file://0010-autoconf-remove-shell-variables-from-autoheader.patch \ |
12 | file://0004-jdk-Allow-using-a-system-installed-libpng.patch \ | ||
13 | file://0005-hotspot-use-correct-include-for-poll.patch \ | ||
14 | file://0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ | ||
15 | file://0007-jdk-use-correct-include-for-poll.patch \ | ||
16 | file://0008-jdk-use-correct-include-for-signal.patch \ | ||
17 | file://0009-jdk-disable-backtrace-musl-build-fix.patch \ | ||
18 | file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \ | ||
19 | file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ | ||
20 | ${HOTSPOT_UB_PATCH} \ | 12 | ${HOTSPOT_UB_PATCH} \ |
21 | ${LIBPNG_NEON_PATCH} \ | 13 | file://2001-jdk-comparison-between-pointer-and-integer.patch \ |
22 | file://handle_extra_output.patch \ | 14 | file://2002-jdk-Allow-using-a-system-installed-libjpeg.patch \ |
23 | file://hotspot-handle-gcc7-format-overflow.patch \ | 15 | file://2003-jdk-Allow-using-a-system-installed-libpng.patch \ |
24 | file://0001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ | 16 | file://2004-jdk-use-correct-include-for-poll.patch \ |
17 | file://2005-jdk-use-correct-include-for-signal.patch \ | ||
18 | file://2006-jdk-disable-backtrace-musl-build-fix.patch \ | ||
19 | file://2007-jdk-no-genx11-in-headless.patch \ | ||
20 | file://2008-jdk-no-unused-deps.patch \ | ||
25 | " | 21 | " |
26 | HOTSPOT_UB_PATCH = "\ | 22 | HOTSPOT_UB_PATCH = "\ |
27 | file://0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch \ | 23 | file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ |
28 | file://0015-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ | 24 | file://1002-hotspot-use-correct-include-for-poll.patch \ |
29 | file://0016-hotspot-Zero-build-requires-disabled-warnings.patch \ | 25 | file://1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ |
30 | file://0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ | 26 | file://1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ |
31 | file://0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch \ | 27 | file://1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ |
32 | file://0019-hotspot-Turn-on-the-Wreturn-type-warning.patch \ | 28 | file://1006-hotspot-Zero-build-requires-disabled-warnings.patch \ |
33 | file://0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch \ | 29 | file://1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ |
30 | file://1008-hotspot-Turn-on-the-Wreturn-type-warning.patch \ | ||
31 | file://1009-hotspot-handle-format-error-for-GCC-7.patch \ | ||
32 | " | ||
33 | HOTSPOT_UB_PATCH_append_class-target = "\ | ||
34 | file://1010-hotspot-fix-adlc-flags.patch \ | ||
35 | file://1011-hotspot-fix-shark-build-common.patch \ | ||
36 | file://1012-hotspot-restrict-to-staging-dir.patch \ | ||
34 | " | 37 | " |
35 | HOTSPOT_UB_PATCH_prepend_aarch64 = "\ | 38 | HOTSPOT_UB_PATCH_prepend_aarch64 = "\ |
36 | file://0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch \ | 39 | file://aarch64-hotspot-Fix-further-functions-with-a-missing.patch \ |
37 | file://0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch \ | ||
38 | " | 40 | " |
39 | HOTSPOT_UB_PATCH_append_armv7a = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" | 41 | HOTSPOT_UB_PATCH_append_armv7a = " file://aarch32-hotspot-fix-missing-return-values.patch" |
40 | HOTSPOT_UB_PATCH_append_armv7ve = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" | 42 | HOTSPOT_UB_PATCH_append_armv7ve = " file://aarch32-hotspot-fix-missing-return-values.patch" |
41 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | ||
42 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | ||
43 | # by Roman Kennke (rkennke at redhat.com) | ||
44 | LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" | ||
45 | LIBPNG_NEON_PATCH_aarch64 = "" | ||
46 | 43 | ||
47 | PATCHES_URI_append_class-target = "\ | 44 | PATCHES_URI_append_class-target = "\ |
48 | file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ | ||
49 | file://openjdk8-fix-shark-build-common.patch;striplevel=0 \ | ||
50 | ${FIX_SHARK_BUILD_PT2_PATCH} \ | 45 | ${FIX_SHARK_BUILD_PT2_PATCH} \ |
51 | file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ | ||
52 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ | ||
53 | file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ | ||
54 | file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ | ||
55 | " | 46 | " |
56 | FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" | 47 | FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" |
57 | FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" | 48 | FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0" |
58 | FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" | 49 | FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0" |
59 | 50 | ||
60 | PATCHES_URI_append_libc-musl = "\ | 51 | PATCHES_URI_append_libc-musl = "\ |
61 | ${OBSOLETE_ISNANF_PATCH} \ | 52 | ${OBSOLETE_ISNANF_PATCH} \ |
@@ -80,9 +71,9 @@ REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc- | |||
80 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | 71 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" |
81 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | 72 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" |
82 | 73 | ||
83 | PATCHES_URI_append_libc-musl_armv7a = " file://hotspot-remaining-musl-fixes-aarch32.patch" | 74 | PATCHES_URI_append_libc-musl_armv7a = " file://aarch32-hotspot-remaining-musl-fixes.patch" |
84 | PATCHES_URI_append_libc-musl_armv7ve = " file://hotspot-remaining-musl-fixes-aarch32.patch" | 75 | PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch" |
85 | PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" | 76 | PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch" |
86 | 77 | ||
87 | # Name of the directory containing the compiled output | 78 | # Name of the directory containing the compiled output |
88 | BUILD_DIR = "openjdk.build" | 79 | BUILD_DIR = "openjdk.build" |
@@ -111,7 +102,12 @@ OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" | |||
111 | OPENJDK_ARCH_PORT_armv7a = "aarch32-port" | 102 | OPENJDK_ARCH_PORT_armv7a = "aarch32-port" |
112 | OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" | 103 | OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" |
113 | OPENJDK_HG_U = "jdk8u" | 104 | OPENJDK_HG_U = "jdk8u" |
114 | OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" | 105 | |
106 | # the aarch64 port moved, for more information see: | ||
107 | # https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html | ||
108 | OPENJDK_HG_U_aarch64 = "jdk8u-shenandoah" | ||
109 | |||
110 | OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" | ||
115 | 111 | ||
116 | OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" | 112 | OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" |
117 | OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" | 113 | OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" |
diff --git a/recipes-core/openjdk/openjdk-8-release.inc b/recipes-core/openjdk/openjdk-8-release.inc new file mode 100644 index 0000000..170338f --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release.inc | |||
@@ -0,0 +1,39 @@ | |||
1 | require openjdk-8-release-common.inc | ||
2 | |||
3 | # We do not yet work for aarch64, and we make sure | ||
4 | # to use the aarch32 port for ARMv7. | ||
5 | COMPATIBLE_HOST = "^(?!(aarch64)).*$" | ||
6 | COMPATIBLE_HOST_armv7a = "^$" | ||
7 | COMPATIBLE_HOST_armv7ve = "^$" | ||
8 | |||
9 | CORBA_CHANGESET = "jdk8u${PV}-ga" | ||
10 | SRC_URI[corba.md5sum] = "e269b1b01c00bec6c9f2684d7e3e6540" | ||
11 | SRC_URI[corba.sha256sum] = "45433c179dd5ee117b8097c75f475feb5a2d2fae052be3e582c59511696a5d0e" | ||
12 | |||
13 | HOTSPOT_CHANGESET = "jdk8u${PV}-ga" | ||
14 | SRC_URI[hotspot.md5sum] = "105c2a6bdfecc2f1fe09aac65748bf47" | ||
15 | SRC_URI[hotspot.sha256sum] = "08729033233b3a42bf1fa3d2a2c0cdf1c950c682cc27bd486f7c19ae28d34ef7" | ||
16 | |||
17 | JAXP_CHANGESET = "jdk8u${PV}-ga" | ||
18 | SRC_URI[jaxp.md5sum] = "a9fb321b6c466e83b9ad23da0d9674c5" | ||
19 | SRC_URI[jaxp.sha256sum] = "8e52661976169fca3fe567b269be5852dff378cb2e66e9f8a4e9f40aaa8d89e4" | ||
20 | |||
21 | JAXWS_CHANGESET = "jdk8u${PV}-ga" | ||
22 | SRC_URI[jaxws.md5sum] = "6ee14ea4974b93bff075499cd820413b" | ||
23 | SRC_URI[jaxws.sha256sum] = "95a14275db59e0c1a8fa4ca4861b8761b1598f0ed7f3ef2f2cef7c619df1eb83" | ||
24 | |||
25 | JDK_CHANGESET = "jdk8u${PV}-ga" | ||
26 | SRC_URI[jdk.md5sum] = "57d2bc331d9506fa652fac686c6b64c1" | ||
27 | SRC_URI[jdk.sha256sum] = "3ecb62288df04d05f541a26da32464c04558a951b2962290f08b149d614ae020" | ||
28 | |||
29 | LANGTOOLS_CHANGESET = "jdk8u${PV}-ga" | ||
30 | SRC_URI[langtools.md5sum] = "5456b86c13a21c8e73a088af5723ba06" | ||
31 | SRC_URI[langtools.sha256sum] = "ffaf18753935cd03b2d581f17789172f4cfdc093d62ca764bf14068d7e30599c" | ||
32 | |||
33 | NASHORN_CHANGESET = "jdk8u${PV}-ga" | ||
34 | SRC_URI[nashorn.md5sum] = "0716fb438451ac45285a0cd8c17cc27b" | ||
35 | SRC_URI[nashorn.sha256sum] = "3a572a5d5c2e8b590c9ac2c65905069a991f7e168f5bbe15e7dbb924b10ab96d" | ||
36 | |||
37 | OPENJDK_CHANGESET = "jdk8u${PV}-ga" | ||
38 | SRC_URI[openjdk.md5sum] = "5f5cf2638bba1b4f9b4915be9973077e" | ||
39 | SRC_URI[openjdk.sha256sum] = "633f1d20d4d8d36fea1680140b5514ab153096a19c306b812fbbd19314c8dece" | ||
diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb b/recipes-core/openjdk/openjdk-8_242.bb index 72f208e..bc6ce51 100644 --- a/recipes-core/openjdk/openjdk-8_172b11.bb +++ b/recipes-core/openjdk/openjdk-8_242.bb | |||
@@ -2,7 +2,7 @@ INC_FILE_SUFFIX = "" | |||
2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" | 2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" |
3 | INC_FILE_SUFFIX_armv7a = "-aarch32" | 3 | INC_FILE_SUFFIX_armv7a = "-aarch32" |
4 | INC_FILE_SUFFIX_armv7ve = "-aarch32" | 4 | INC_FILE_SUFFIX_armv7ve = "-aarch32" |
5 | require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc | 5 | require openjdk-8-release${INC_FILE_SUFFIX}.inc |
6 | require openjdk-8-cross.inc | 6 | require openjdk-8-cross.inc |
7 | 7 | ||
8 | do_install() { | 8 | do_install() { |
@@ -11,7 +11,7 @@ do_install() { | |||
11 | cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME} | 11 | cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME} |
12 | chown -R root:root ${D}${JDK_HOME} | 12 | chown -R root:root ${D}${JDK_HOME} |
13 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ | 13 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ |
14 | find ${D}${JDK_HOME} -name "*.debuginfo" -print0 | xargs -0 rm | 14 | find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \; |
15 | } | 15 | } |
16 | 16 | ||
17 | PACKAGES_append = " \ | 17 | PACKAGES_append = " \ |
diff --git a/recipes-core/openjdk/openjre-8_172b11.bb b/recipes-core/openjdk/openjre-8_242.bb index e9b930b..4ed2e6b 100644 --- a/recipes-core/openjdk/openjre-8_172b11.bb +++ b/recipes-core/openjdk/openjre-8_242.bb | |||
@@ -2,7 +2,7 @@ INC_FILE_SUFFIX = "" | |||
2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" | 2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" |
3 | INC_FILE_SUFFIX_armv7a = "-aarch32" | 3 | INC_FILE_SUFFIX_armv7a = "-aarch32" |
4 | INC_FILE_SUFFIX_armv7ve = "-aarch32" | 4 | INC_FILE_SUFFIX_armv7ve = "-aarch32" |
5 | require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc | 5 | require openjdk-8-release${INC_FILE_SUFFIX}.inc |
6 | require openjdk-8-cross.inc | 6 | require openjdk-8-cross.inc |
7 | 7 | ||
8 | do_install() { | 8 | do_install() { |
@@ -11,7 +11,7 @@ do_install() { | |||
11 | cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME} | 11 | cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME} |
12 | chown -R root:root ${D}${JRE_HOME} | 12 | chown -R root:root ${D}${JRE_HOME} |
13 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ | 13 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ |
14 | find ${D}${JRE_HOME} -name "*.debuginfo" -print0 | xargs -0 rm | 14 | find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \; |
15 | } | 15 | } |
16 | 16 | ||
17 | FILES_${PN}_append = "\ | 17 | FILES_${PN}_append = "\ |
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch new file mode 100644 index 0000000..e9662eb --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | From 836aad60652299a26341b46a4a9a2e6c418b6947 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Tue, 27 Feb 2018 13:36:53 +0000 | ||
4 | Subject: [PATCH 01/10] Allow using a system-installed libjpeg | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Patch stolen (and some typos corrected) from debian patch, | ||
10 | which itself was a backport from: | ||
11 | http://hg.openjdk.java.net/jdk9/client/rev/bfd9a3e1aeb5 | ||
12 | http://hg.openjdk.java.net/jdk9/client/jdk/rev/320743f0b4fc | ||
13 | |||
14 | Issues fixed on top of debian patch: | ||
15 | * imageIOJPEG.c -> imageioJPEG.c | ||
16 | * $(LIBJPEG_LIBS) must be added to LDFLAGS_SUFFIX, not | ||
17 | LDFLAGS as it otherwise doesn't make it into the linker | ||
18 | command line and then fails when using -Wl,-z,now in | ||
19 | LDFLAGS (as done when 'security' is enabled) | ||
20 | |||
21 | Upstream-Status: Backport | ||
22 | |||
23 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
24 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
25 | --- | ||
26 | common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++----- | ||
27 | 1 file changed, 30 insertions(+), 5 deletions(-) | ||
28 | |||
29 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | ||
30 | index 6d803f9..d2732eb 100644 | ||
31 | --- a/common/autoconf/libraries.m4 | ||
32 | +++ b/common/autoconf/libraries.m4 | ||
33 | @@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | ||
34 | # Check for the jpeg library | ||
35 | # | ||
36 | |||
37 | - USE_EXTERNAL_LIBJPEG=true | ||
38 | - AC_CHECK_LIB(jpeg, main, [], | ||
39 | - [ USE_EXTERNAL_LIBJPEG=false | ||
40 | - AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source]) | ||
41 | - ]) | ||
42 | + AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg], | ||
43 | + [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) | ||
44 | + | ||
45 | + AC_MSG_CHECKING([for which libjpeg to use]) | ||
46 | + | ||
47 | + # default is bundled | ||
48 | + DEFAULT_LIBJPEG=bundled | ||
49 | + | ||
50 | + # | ||
51 | + # if user didn't specify, use DEFAULT_LIBJPEG | ||
52 | + # | ||
53 | + if test "x${with_libjpeg}" = "x"; then | ||
54 | + with_libjpeg=${DEFAULT_LIBJPEG} | ||
55 | + fi | ||
56 | + | ||
57 | + AC_MSG_RESULT(${with_libjpeg}) | ||
58 | + | ||
59 | + if test "x${with_libjpeg}" = "xbundled"; then | ||
60 | + USE_EXTERNAL_LIBJPEG=false | ||
61 | + elif test "x${with_libjpeg}" = "xsystem"; then | ||
62 | + AC_CHECK_HEADER(jpeglib.h, [], | ||
63 | + [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])]) | ||
64 | + AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [], | ||
65 | + [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])]) | ||
66 | + | ||
67 | + USE_EXTERNAL_LIBJPEG=true | ||
68 | + else | ||
69 | + AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled']) | ||
70 | + fi | ||
71 | + | ||
72 | AC_SUBST(USE_EXTERNAL_LIBJPEG) | ||
73 | |||
74 | ############################################################################### | ||
75 | -- | ||
76 | 2.24.1 | ||
77 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch new file mode 100644 index 0000000..ed8ecfa --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch | |||
@@ -0,0 +1,80 @@ | |||
1 | From ed79dc49323cc08e81b3699817825f66b1af0ce2 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Thu, 2 Jan 2020 13:40:50 +0100 | ||
4 | Subject: [PATCH 02/10] Allow using a system-installed libpng | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Patch stolen (and some typos corrected) from debian patch, | ||
10 | which itself was a backport from: | ||
11 | http://hg.openjdk.java.net/jdk9/jdk9/rev/bfc1c131e540 | ||
12 | http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5e503831b142 | ||
13 | |||
14 | Issues fixed on top of debian patch: | ||
15 | * the default when --with-libpng= is not given works | ||
16 | * using the bundled libpng works | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
22 | --- | ||
23 | common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++++++++++++++++ | ||
24 | 1 file changed, 41 insertions(+) | ||
25 | |||
26 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | ||
27 | index d2732eb..727f018 100644 | ||
28 | --- a/common/autoconf/libraries.m4 | ||
29 | +++ b/common/autoconf/libraries.m4 | ||
30 | @@ -843,6 +843,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | ||
31 | fi | ||
32 | AC_SUBST(USE_EXTERNAL_LIBGIF) | ||
33 | |||
34 | + ############################################################################### | ||
35 | + # | ||
36 | + # Check for the png library | ||
37 | + # | ||
38 | + | ||
39 | + AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng], | ||
40 | + [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) | ||
41 | + | ||
42 | + AC_CHECK_LIB(png, png_sig_cmp, | ||
43 | + [ LIBPNG_FOUND=yes ], | ||
44 | + [ LIBPNG_FOUND=no ]) | ||
45 | + | ||
46 | + AC_MSG_CHECKING([for which libpng to use]) | ||
47 | + | ||
48 | + # default is bundled | ||
49 | + DEFAULT_LIBPNG=bundled | ||
50 | + | ||
51 | + # | ||
52 | + # if user didn't specify, use DEFAULT_LIBPNG | ||
53 | + # | ||
54 | + if test "x${with_libpng}" = "x"; then | ||
55 | + with_libpng=${DEFAULT_LIBPNG} | ||
56 | + fi | ||
57 | + | ||
58 | + | ||
59 | + if test "x${with_libpng}" = "xbundled"; then | ||
60 | + USE_EXTERNAL_LIBPNG=false | ||
61 | + AC_MSG_RESULT([bundled]) | ||
62 | + elif test "x${with_libpng}" = "xsystem"; then | ||
63 | + if test "x${LIBPNG_FOUND}" = "xyes"; then | ||
64 | + USE_EXTERNAL_LIBPNG=true | ||
65 | + AC_MSG_RESULT([system]) | ||
66 | + else | ||
67 | + AC_MSG_RESULT([system not found]) | ||
68 | + AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!]) | ||
69 | + fi | ||
70 | + else | ||
71 | + AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled']) | ||
72 | + fi | ||
73 | + AC_SUBST(USE_EXTERNAL_LIBPNG) | ||
74 | + | ||
75 | ############################################################################### | ||
76 | # | ||
77 | # Check for the zlib library | ||
78 | -- | ||
79 | 2.24.1 | ||
80 | |||
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 deleted file mode 100644 index a94e90f..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From bdea8cf299313388ec41ea20281deca6dc4f764d Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Tue, 27 Feb 2018 14:41:06 +0000 | ||
4 | Subject: [PATCH 2/9] 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@jci.com> | ||
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 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch index 2d02b7c..0e3359c 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 84bcdb9cdab0e0be9cdfededfb518d3cea9009e3 Mon Sep 17 00:00:00 2001 | 1 | From 4cde9ea2adf8c57168a299f11625083d1822b0de Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 12 Mar 2018 15:40:58 +0000 | 3 | Date: Mon, 12 Mar 2018 15:40:58 +0000 |
4 | Subject: [PATCH] build: fix build on --as-needed toolchains (generic) | 4 | Subject: [PATCH 03/10] build: fix build on --as-needed toolchains (generic) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -65,16 +65,16 @@ any additional libraries, so as to fix this once and for | |||
65 | all. | 65 | all. |
66 | 66 | ||
67 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 67 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
68 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
68 | --- | 69 | --- |
69 | Upstream-Status: Pending | ||
70 | make/common/NativeCompilation.gmk | 5 ++--- | 70 | make/common/NativeCompilation.gmk | 5 ++--- |
71 | 1 file changed, 2 insertions(+), 3 deletions(-) | 71 | 1 file changed, 2 insertions(+), 3 deletions(-) |
72 | 72 | ||
73 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk | 73 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk |
74 | index e7ea22ce..79f081fd 100644 | 74 | index d961cf3..92f8033 100644 |
75 | --- a/make/common/NativeCompilation.gmk | 75 | --- a/make/common/NativeCompilation.gmk |
76 | +++ b/make/common/NativeCompilation.gmk | 76 | +++ b/make/common/NativeCompilation.gmk |
77 | @@ -477,9 +477,8 @@ define SetupNativeCompilation | 77 | @@ -618,9 +618,8 @@ endif # no MacOS X support yet |
78 | 78 | ||
79 | $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) | 79 | $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) |
80 | $$(call LINKING_EXE_MSG,$$($1_BASENAME)) | 80 | $$(call LINKING_EXE_MSG,$$($1_BASENAME)) |
@@ -87,5 +87,5 @@ index e7ea22ce..79f081fd 100644 | |||
87 | $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 | 87 | $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 |
88 | endif | 88 | endif |
89 | -- | 89 | -- |
90 | 2.16.2 | 90 | 2.24.1 |
91 | 91 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch index 5192d1a..db00b24 100644 --- a/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch | |||
@@ -1,6 +1,18 @@ | |||
1 | --- common/autoconf/basics.m4.orig | 1 | From f4c93547119c7550626e1b2ae2b750ea4f83b3fe Mon Sep 17 00:00:00 2001 |
2 | +++ common/autoconf/basics.m4 | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | @@ -555,10 +555,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], | 3 | Date: Thu, 2 Jan 2020 13:42:43 +0100 |
4 | Subject: [PATCH 04/10] don't expect fqpn for make | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | common/autoconf/basics.m4 | 8 +++++--- | ||
9 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 | ||
12 | index 4ee9cdd..c20ea76 100644 | ||
13 | --- a/common/autoconf/basics.m4 | ||
14 | +++ b/common/autoconf/basics.m4 | ||
15 | @@ -740,10 +740,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], | ||
4 | # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. | 16 | # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. |
5 | if test "x$MAKE" != x; then | 17 | if test "x$MAKE" != x; then |
6 | # User has supplied a make, test it. | 18 | # User has supplied a make, test it. |
@@ -16,3 +28,6 @@ | |||
16 | if test "x$FOUND_MAKE" = x; then | 28 | if test "x$FOUND_MAKE" = x; then |
17 | AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.]) | 29 | AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.]) |
18 | fi | 30 | fi |
31 | -- | ||
32 | 2.24.1 | ||
33 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch deleted file mode 100644 index 658ba32..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
1 | From 549100e3e687d2c844eeebe22a7dcbf7ed50406e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Tue, 27 Feb 2018 13:43:04 +0000 | ||
4 | Subject: [PATCH 4/9] jdk: Allow using a system-installed libpng | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Patch stolen (and some typos corrected) from debian patch, | ||
10 | which itself was a backport from: | ||
11 | http://hg.openjdk.java.net/jdk9/jdk9/rev/bfc1c131e540 | ||
12 | http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5e503831b142 | ||
13 | |||
14 | Issues fixed on top of debian patch: | ||
15 | * the default when --with-libpng= is not given works | ||
16 | * using the bundled libpng works | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
20 | --- | ||
21 | common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++ | ||
22 | common/autoconf/spec.gmk.in | 1 + | ||
23 | jdk/make/lib/Awt2dLibraries.gmk | 12 +++++-- | ||
24 | .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +- | ||
25 | 4 files changed, 52 insertions(+), 5 deletions(-) | ||
26 | |||
27 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | ||
28 | index 3f5f69b1..e419a050 100644 | ||
29 | --- a/common/autoconf/libraries.m4 | ||
30 | +++ b/common/autoconf/libraries.m4 | ||
31 | @@ -664,6 +664,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | ||
32 | fi | ||
33 | AC_SUBST(USE_EXTERNAL_LIBGIF) | ||
34 | |||
35 | + ############################################################################### | ||
36 | + # | ||
37 | + # Check for the png library | ||
38 | + # | ||
39 | + | ||
40 | + AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng], | ||
41 | + [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) | ||
42 | + | ||
43 | + AC_CHECK_LIB(png, png_sig_cmp, | ||
44 | + [ LIBPNG_FOUND=yes ], | ||
45 | + [ LIBPNG_FOUND=no ]) | ||
46 | + | ||
47 | + AC_MSG_CHECKING([for which libpng to use]) | ||
48 | + | ||
49 | + # default is bundled | ||
50 | + DEFAULT_LIBPNG=bundled | ||
51 | + | ||
52 | + # | ||
53 | + # if user didn't specify, use DEFAULT_LIBPNG | ||
54 | + # | ||
55 | + if test "x${with_libpng}" = "x"; then | ||
56 | + with_libpng=${DEFAULT_LIBPNG} | ||
57 | + fi | ||
58 | + | ||
59 | + | ||
60 | + if test "x${with_libpng}" = "xbundled"; then | ||
61 | + USE_EXTERNAL_LIBPNG=false | ||
62 | + AC_MSG_RESULT([bundled]) | ||
63 | + elif test "x${with_libpng}" = "xsystem"; then | ||
64 | + if test "x${LIBPNG_FOUND}" = "xyes"; then | ||
65 | + USE_EXTERNAL_LIBPNG=true | ||
66 | + AC_MSG_RESULT([system]) | ||
67 | + else | ||
68 | + AC_MSG_RESULT([system not found]) | ||
69 | + AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!]) | ||
70 | + fi | ||
71 | + else | ||
72 | + AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled']) | ||
73 | + fi | ||
74 | + AC_SUBST(USE_EXTERNAL_LIBPNG) | ||
75 | + | ||
76 | ############################################################################### | ||
77 | # | ||
78 | # Check for the zlib library | ||
79 | diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in | ||
80 | index 1c418f29..2c802c0a 100644 | ||
81 | --- a/common/autoconf/spec.gmk.in | ||
82 | +++ b/common/autoconf/spec.gmk.in | ||
83 | @@ -567,6 +567,7 @@ endif | ||
84 | ENABLE_JFR=@ENABLE_JFR@ | ||
85 | ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ | ||
86 | USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ | ||
87 | +USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@ | ||
88 | USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ | ||
89 | USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ | ||
90 | LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ | ||
91 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | ||
92 | index 8872a8e8..c577951a 100644 | ||
93 | --- a/jdk/make/lib/Awt2dLibraries.gmk | ||
94 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | ||
95 | @@ -1219,7 +1219,6 @@ endif | ||
96 | ifndef BUILD_HEADLESS_ONLY | ||
97 | LIBSPLASHSCREEN_DIRS := \ | ||
98 | $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ | ||
99 | - $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \ | ||
100 | $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen | ||
101 | |||
102 | ifeq ($(USE_EXTERNAL_LIBGIF), true) | ||
103 | @@ -1236,6 +1235,13 @@ ifndef BUILD_HEADLESS_ONLY | ||
104 | LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg | ||
105 | endif | ||
106 | |||
107 | + ifeq ($(USE_EXTERNAL_LIBPNG), true) | ||
108 | + LIBPNG_LDFLAGS := -lpng | ||
109 | + else | ||
110 | + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng | ||
111 | + LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng | ||
112 | + endif | ||
113 | + | ||
114 | ifneq ($(OPENJDK_TARGET_OS), macosx) | ||
115 | LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen | ||
116 | else | ||
117 | @@ -1297,12 +1303,12 @@ ifndef BUILD_HEADLESS_ONLY | ||
118 | LANG := C, \ | ||
119 | OPTIMIZATION := LOW, \ | ||
120 | CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ | ||
121 | - $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \ | ||
122 | + $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \ | ||
123 | MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ | ||
124 | LDFLAGS := $(LDFLAGS_JDKLIB) \ | ||
125 | $(call SET_SHARED_LIBRARY_ORIGIN), \ | ||
126 | LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ | ||
127 | - $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \ | ||
128 | + $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \ | ||
129 | LDFLAGS_SUFFIX_solaris := -lc, \ | ||
130 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | ||
131 | RC_FLAGS := $(RC_FLAGS) \ | ||
132 | diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
133 | index 3599433e..5bf002ea 100644 | ||
134 | --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
135 | +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
136 | @@ -25,8 +25,7 @@ | ||
137 | |||
138 | #include "splashscreen_impl.h" | ||
139 | |||
140 | -#include "../libpng/png.h" | ||
141 | - | ||
142 | +#include <png.h> | ||
143 | #include <setjmp.h> | ||
144 | |||
145 | #define SIG_BYTES 8 | ||
146 | -- | ||
147 | 2.16.2 | ||
148 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch new file mode 100644 index 0000000..262f0b7 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From b8bab47b58be4a0102011825c2ee3dd2c6427d08 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Rehsack <rehsack@gmail.com> | ||
3 | Date: Thu, 2 Jan 2020 13:44:25 +0100 | ||
4 | Subject: [PATCH 05/10] autoconf: filter aclocal copy too | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | common/autoconf/basics.m4 | 1 + | ||
9 | 1 file changed, 1 insertion(+) | ||
10 | |||
11 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 | ||
12 | index c20ea76..8e06cd2 100644 | ||
13 | --- a/common/autoconf/basics.m4 | ||
14 | +++ b/common/autoconf/basics.m4 | ||
15 | @@ -636,6 +636,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], | ||
16 | | $SED -e 's/config.log//g' \ | ||
17 | -e 's/confdefs.h//g' \ | ||
18 | -e 's/fixpath.exe//g' \ | ||
19 | + -e 's,aclocal-copy,,g' \ | ||
20 | -e 's/ //g' \ | ||
21 | | $TR -d '\n'` | ||
22 | if test "x$filtered_files" != x; then | ||
23 | -- | ||
24 | 2.24.1 | ||
25 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch index a8d2786..c5fa4bf 100644 --- a/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch | |||
@@ -1,9 +1,21 @@ | |||
1 | From cf40c00dfd6d2299055c0e8415525d2da5e7cd4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
3 | Date: Thu, 2 Jan 2020 13:45:42 +0100 | ||
4 | Subject: [PATCH 06/10] autoconf: handle extra output | ||
5 | |||
1 | When adding the environment variable JAVA_TOOL_OPTIONS an extra line | 6 | When adding the environment variable JAVA_TOOL_OPTIONS an extra line |
2 | in the output from 'java -version' is produced. As this output is | 7 | in the output from 'java -version' is produced. As this output is |
3 | parsed by configure script the extra line has to be filtered out. | 8 | parsed by configure script the extra line has to be filtered out. |
4 | 9 | ||
5 | --- jdk8u-4be07cb28b21.orig/common/autoconf/boot-jdk.m4 | 10 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
6 | +++ jdk8u-4be07cb28b21/common/autoconf/boot-jdk.m4 | 11 | --- |
12 | common/autoconf/boot-jdk.m4 | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 | ||
16 | index 5be15b8..0d1a6e1 100644 | ||
17 | --- a/common/autoconf/boot-jdk.m4 | ||
18 | +++ b/common/autoconf/boot-jdk.m4 | ||
7 | @@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], | 19 | @@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], |
8 | BOOT_JDK_FOUND=no | 20 | BOOT_JDK_FOUND=no |
9 | else | 21 | else |
@@ -13,3 +25,6 @@ parsed by configure script the extra line has to be filtered out. | |||
13 | 25 | ||
14 | # Extra M4 quote needed to protect [] in grep expression. | 26 | # Extra M4 quote needed to protect [] in grep expression. |
15 | [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] | 27 | [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] |
28 | -- | ||
29 | 2.24.1 | ||
30 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch new file mode 100644 index 0000000..c99d599 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From ec3aa8ae1159ff5ef37fae1ba470cf1886aa8d79 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> | ||
3 | Date: Thu, 2 Jan 2020 13:49:02 +0100 | ||
4 | Subject: [PATCH 07/10] fix assembler flag handling in makefile | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Delay $CXX insertion until after make has evaluated the comma-separated | ||
10 | list, as any comma separated parameters in CXX (such as assembler arguments) | ||
11 | would break the build | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> | ||
16 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
17 | --- | ||
18 | make/common/NativeCompilation.gmk | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk | ||
22 | index 92f8033..46a1be9 100644 | ||
23 | --- a/make/common/NativeCompilation.gmk | ||
24 | +++ b/make/common/NativeCompilation.gmk | ||
25 | @@ -391,7 +391,7 @@ define SetupNativeCompilation | ||
26 | $$(foreach p,$$($1_SRCS), \ | ||
27 | $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ | ||
28 | $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \ | ||
29 | - $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS)))) | ||
30 | + $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$$(CXX),$$($1_ASFLAGS)))) | ||
31 | |||
32 | # On windows we need to create a resource file | ||
33 | ifeq ($(OPENJDK_TARGET_OS), windows) | ||
34 | -- | ||
35 | 2.24.1 | ||
36 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch new file mode 100644 index 0000000..b783613 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From c530da1c0269d1e9a875670943446876227fdb71 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Rehsack <rehsack@gmail.com> | ||
3 | Date: Thu, 2 Jan 2020 13:51:40 +0100 | ||
4 | Subject: [PATCH 08/10] autoconf: fix shark build (common) | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | common/autoconf/libraries.m4 | 5 +++-- | ||
9 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | ||
12 | index 727f018..91d2b5c 100644 | ||
13 | --- a/common/autoconf/libraries.m4 | ||
14 | +++ b/common/autoconf/libraries.m4 | ||
15 | @@ -1079,8 +1079,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], | ||
16 | fi | ||
17 | fi | ||
18 | done | ||
19 | - llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//') | ||
20 | + llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//; s/\..*$//') | ||
21 | LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}" | ||
22 | + AS_IF([test $llvm_version -ge 34], [LLVM_CFLAGS="${LLVM_CFLAGS} -std=gnu++11"]) | ||
23 | |||
24 | unset LLVM_LDFLAGS | ||
25 | for flag in $("${LLVM_CONFIG}" --ldflags); do | ||
26 | @@ -1093,7 +1094,7 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], | ||
27 | done | ||
28 | |||
29 | unset LLVM_LIBS | ||
30 | - for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do | ||
31 | + for flag in $("${LLVM_CONFIG}" --libs --system-libs ${llvm_components}); do | ||
32 | if echo "${flag}" | grep -q '^-l'; then | ||
33 | if test "${LLVM_LIBS}" != ""; then | ||
34 | LLVM_LIBS="${LLVM_LIBS} " | ||
35 | -- | ||
36 | 2.24.1 | ||
37 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch index 7d340a8..14fccd1 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch | |||
@@ -1,40 +1,59 @@ | |||
1 | --- make/common/NativeCompilation.gmk.orig | 1 | From a5f2646a9dd0f7191e9e0aa5eba5fdd9d70d1671 Mon Sep 17 00:00:00 2001 |
2 | +++ make/common/NativeCompilation.gmk | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | @@ -438,58 +438,6 @@ define SetupNativeCompilation | 3 | Date: Thu, 2 Jan 2020 13:53:50 +0100 |
4 | $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% | 4 | Subject: [PATCH 09/10] prevent debuginfo in favour of openembedded package |
5 | split | ||
6 | |||
7 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
8 | --- | ||
9 | make/common/NativeCompilation.gmk | 122 ------------------------------ | ||
10 | 1 file changed, 122 deletions(-) | ||
11 | |||
12 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk | ||
13 | index 46a1be9..b4ea2c6 100644 | ||
14 | --- a/make/common/NativeCompilation.gmk | ||
15 | +++ b/make/common/NativeCompilation.gmk | ||
16 | @@ -456,67 +456,6 @@ define SetupNativeCompilation | ||
5 | $(CP) $$< $$@ | 17 | $(CP) $$< $$@ |
6 | endif | 18 | endif |
7 | - | 19 | |
8 | - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X | 20 | - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X |
9 | - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows | 21 | - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows |
10 | - ifeq ($(OPENJDK_TARGET_OS), solaris) | 22 | - ifeq ($(OPENJDK_TARGET_OS), solaris) |
11 | - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. | 23 | - ifneq ($$($1_STRIP_POLICY), no_strip) |
12 | - # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from | 24 | - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. |
13 | - # empty section headers until a fixed $(OBJCOPY) is available. | 25 | - # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from |
14 | - # An empty section header has sh_addr == 0 and sh_size == 0. | 26 | - # empty section headers until a fixed $(OBJCOPY) is available. |
15 | - # This problem has only been seen on Solaris X64, but we call this tool | 27 | - # An empty section header has sh_addr == 0 and sh_size == 0. |
16 | - # on all Solaris builds just in case. | 28 | - # This problem has only been seen on Solaris X64, but we call this tool |
17 | - # | 29 | - # on all Solaris builds just in case. |
18 | - # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. | 30 | - # |
19 | - # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. | 31 | - # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. |
20 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ | 32 | - # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. |
33 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ | ||
21 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) | 34 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) |
22 | - $(RM) $$@ | 35 | - $(RM) $$@ |
23 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< | 36 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< |
24 | - $(OBJCOPY) --only-keep-debug $$< $$@ | 37 | - $(OBJCOPY) --only-keep-debug $$< $$@ |
25 | - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< | 38 | - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< |
39 | - endif | ||
26 | - else # not solaris | 40 | - else # not solaris |
27 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) | 41 | - ifneq ($$($1_STRIP_POLICY), no_strip) |
42 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) | ||
28 | - $(RM) $$@ | 43 | - $(RM) $$@ |
29 | - $(OBJCOPY) --only-keep-debug $$< $$@ | 44 | - $(OBJCOPY) --only-keep-debug $$< $$@ |
30 | - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< | 45 | - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< |
46 | - endif | ||
31 | - endif # Touch to not retrigger rule on rebuild | 47 | - endif # Touch to not retrigger rule on rebuild |
48 | - ifneq ($$($1_STRIP_POLICY), no_strip) | ||
32 | - $(TOUCH) $$@ | 49 | - $(TOUCH) $$@ |
50 | - endif | ||
33 | - endif # !windows | 51 | - endif # !windows |
34 | - endif # !macosx | 52 | - endif # !macosx |
35 | - | 53 | - |
36 | - ifeq ($(ZIP_DEBUGINFO_FILES), true) | 54 | - ifeq ($(ZIP_DEBUGINFO_FILES), true) |
37 | -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet | 55 | -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet |
56 | -ifneq ($$($1_STRIP_POLICY), no_strip) | ||
38 | - $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz | 57 | - $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz |
39 | - | 58 | - |
40 | - ifeq ($(OPENJDK_TARGET_OS), windows) | 59 | - ifeq ($(OPENJDK_TARGET_OS), windows) |
@@ -47,53 +66,62 @@ | |||
47 | - $(CD) $$($1_OBJECT_DIR) \ | 66 | - $(CD) $$($1_OBJECT_DIR) \ |
48 | - && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo | 67 | - && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo |
49 | - endif | 68 | - endif |
69 | -endif # not possible when stripping is disabled | ||
50 | -endif # no MacOS X support yet | 70 | -endif # no MacOS X support yet |
51 | - else | 71 | - else |
52 | - ifeq ($(OPENJDK_TARGET_OS), windows) | 72 | - ifeq ($(OPENJDK_TARGET_OS), windows) |
53 | - $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ | 73 | - $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ |
54 | - $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb | 74 | - $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb |
55 | - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files | 75 | - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files |
56 | - $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo | 76 | - ifneq ($$($1_STRIP_POLICY), no_strip) |
77 | - $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo | ||
78 | - endif | ||
57 | - endif | 79 | - endif |
58 | - endif | 80 | - endif |
59 | endif | 81 | endif |
60 | endif | 82 | endif |
61 | 83 | ||
62 | @@ -522,58 +470,6 @@ endif # no MacOS X support yet | 84 | @@ -550,67 +489,6 @@ endif # no MacOS X support yet |
63 | $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% | ||
64 | $(CP) $$< $$@ | 85 | $(CP) $$< $$@ |
65 | endif | 86 | endif |
66 | - | 87 | |
67 | - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X | 88 | - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X |
68 | - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows | 89 | - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows |
69 | - ifeq ($(OPENJDK_TARGET_OS), solaris) | 90 | - ifeq ($(OPENJDK_TARGET_OS), solaris) |
70 | - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. | 91 | - ifneq ($$($1_STRIP_POLICY), no_strip) |
71 | - # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from | 92 | - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. |
72 | - # empty section headers until a fixed $(OBJCOPY) is available. | 93 | - # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from |
73 | - # An empty section header has sh_addr == 0 and sh_size == 0. | 94 | - # empty section headers until a fixed $(OBJCOPY) is available. |
74 | - # This problem has only been seen on Solaris X64, but we call this tool | 95 | - # An empty section header has sh_addr == 0 and sh_size == 0. |
75 | - # on all Solaris builds just in case. | 96 | - # This problem has only been seen on Solaris X64, but we call this tool |
76 | - # | 97 | - # on all Solaris builds just in case. |
77 | - # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. | 98 | - # |
78 | - # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. | 99 | - # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. |
79 | - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ | 100 | - # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. |
101 | - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ | ||
80 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) | 102 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) |
81 | - $(RM) $$@ | 103 | - $(RM) $$@ |
82 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< | 104 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< |
83 | - $(OBJCOPY) --only-keep-debug $$< $$@ | 105 | - $(OBJCOPY) --only-keep-debug $$< $$@ |
84 | - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< | 106 | - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< |
107 | - endif | ||
85 | - else # not solaris | 108 | - else # not solaris |
86 | - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) | 109 | - ifneq ($$($1_STRIP_POLICY), no_strip) |
110 | - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) | ||
87 | - $(RM) $$@ | 111 | - $(RM) $$@ |
88 | - $(OBJCOPY) --only-keep-debug $$< $$@ | 112 | - $(OBJCOPY) --only-keep-debug $$< $$@ |
89 | - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< | 113 | - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< |
114 | - endif | ||
90 | - endif | 115 | - endif |
116 | - ifneq ($$($1_STRIP_POLICY), no_strip) | ||
91 | - $(TOUCH) $$@ | 117 | - $(TOUCH) $$@ |
118 | - endif | ||
92 | - endif # !windows | 119 | - endif # !windows |
93 | - endif # !macosx | 120 | - endif # !macosx |
94 | - | 121 | - |
95 | - ifeq ($(ZIP_DEBUGINFO_FILES), true) | 122 | - ifeq ($(ZIP_DEBUGINFO_FILES), true) |
96 | -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet | 123 | -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet |
124 | -ifneq ($$($1_STRIP_POLICY), no_strip) | ||
97 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz | 125 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz |
98 | - | 126 | - |
99 | - ifeq ($(OPENJDK_TARGET_OS), windows) | 127 | - ifeq ($(OPENJDK_TARGET_OS), windows) |
@@ -106,15 +134,21 @@ | |||
106 | - $(CD) $$($1_OBJECT_DIR) \ | 134 | - $(CD) $$($1_OBJECT_DIR) \ |
107 | - && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo | 135 | - && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo |
108 | - endif | 136 | - endif |
137 | -endif | ||
109 | -endif # no MacOS X support yet | 138 | -endif # no MacOS X support yet |
110 | - else | 139 | - else |
111 | - ifeq ($(OPENJDK_TARGET_OS), windows) | 140 | - ifeq ($(OPENJDK_TARGET_OS), windows) |
112 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ | 141 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ |
113 | - $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb | 142 | - $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb |
114 | - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files | 143 | - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files |
115 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo | 144 | - ifneq ($$($1_STRIP_POLICY), no_strip) |
145 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo | ||
146 | - endif | ||
116 | - endif | 147 | - endif |
117 | - endif | 148 | - endif |
118 | endif | 149 | endif |
119 | endif | 150 | endif |
120 | 151 | ||
152 | -- | ||
153 | 2.24.1 | ||
154 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch index 5e2f78b..57099ec 100644 --- a/recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch | |||
@@ -1,6 +1,18 @@ | |||
1 | --- common/autoconf/basics.m4.orig | 1 | From 0d22dccb4de73d274b90e2647702b92958374bc1 Mon Sep 17 00:00:00 2001 |
2 | +++ common/autoconf/basics.m4 | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | @@ -472,21 +472,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], | 3 | Date: Thu, 2 Jan 2020 13:55:29 +0100 |
4 | Subject: [PATCH 10/10] autoconf: remove shell variables from autoheader | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | common/autoconf/basics.m4 | 14 +++++++------- | ||
9 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
10 | |||
11 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 | ||
12 | index 8e06cd2..c220bba 100644 | ||
13 | --- a/common/autoconf/basics.m4 | ||
14 | +++ b/common/autoconf/basics.m4 | ||
15 | @@ -661,21 +661,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], | ||
4 | AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) | 16 | AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) |
5 | 17 | ||
6 | # Most of the probed defines are put into config.h | 18 | # Most of the probed defines are put into config.h |
@@ -26,6 +38,9 @@ | |||
26 | # which will look for generated configurations | 38 | # which will look for generated configurations |
27 | - AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) | 39 | - AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) |
28 | + AC_CONFIG_FILES([Makefile:Makefile.in]) | 40 | + AC_CONFIG_FILES([Makefile:Makefile.in]) |
41 | ]) | ||
29 | 42 | ||
30 | # Save the arguments given to us | 43 | AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], |
31 | echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments | 44 | -- |
45 | 2.24.1 | ||
46 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch new file mode 100644 index 0000000..f1de194 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 | ||
2 | index e3a82c8..705e3e7 100644 | ||
3 | --- a/common/autoconf/toolchain.m4 | ||
4 | +++ b/common/autoconf/toolchain.m4 | ||
5 | @@ -478,23 +478,30 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], | ||
6 | SEARCH_LIST="$3" | ||
7 | |||
8 | if test "x[$]$1" != x; then | ||
9 | + # split compiler program and arguments | ||
10 | + CBIN=`cut -d ' ' -f1 <<<"[$]$1"` | ||
11 | + CARGS=`cut -d ' ' -f2- <<<"[$]$1"` | ||
12 | + | ||
13 | # User has supplied compiler name already, always let that override. | ||
14 | - AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1]) | ||
15 | - if test "x`basename [$]$1`" = "x[$]$1"; then | ||
16 | + AC_MSG_NOTICE([Will use user supplied compiler ($CBIN) $1=[$]$1]) | ||
17 | + if test "x`basename $CBIN`" = "x$CBIN"; then | ||
18 | # A command without a complete path is provided, search $PATH. | ||
19 | |||
20 | - AC_PATH_PROGS(POTENTIAL_$1, [$]$1) | ||
21 | - if test "x$POTENTIAL_$1" != x; then | ||
22 | - $1=$POTENTIAL_$1 | ||
23 | + AC_PATH_PROGS(POTENTIAL_CBIN, $CBIN) | ||
24 | + if test "x$POTENTIAL_CBIN" != x; then | ||
25 | + CBIN=$POTENTIAL_CBIN | ||
26 | else | ||
27 | - AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found]) | ||
28 | + AC_MSG_ERROR([User supplied compiler $1=$CBIN could not be found]) | ||
29 | fi | ||
30 | else | ||
31 | # Otherwise it might already be a complete path | ||
32 | - if test ! -x "[$]$1"; then | ||
33 | - AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist]) | ||
34 | + if test ! -x "$CBIN"; then | ||
35 | + AC_MSG_ERROR([User supplied compiler $1=$CBIN does not exist]) | ||
36 | fi | ||
37 | fi | ||
38 | + | ||
39 | + $1="$CBIN $CARGS" | ||
40 | + AC_MSG_NOTICE([Mapped user supplied compiler to $1=[$]$1]) | ||
41 | else | ||
42 | # No user supplied value. Locate compiler ourselves. | ||
43 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch b/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch new file mode 100644 index 0000000..39179d4 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk | ||
2 | index d961cf3..9679f97 100644 | ||
3 | --- a/make/common/NativeCompilation.gmk | ||
4 | +++ b/make/common/NativeCompilation.gmk | ||
5 | @@ -383,10 +383,6 @@ define SetupNativeCompilation | ||
6 | $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION)) | ||
7 | endif | ||
8 | |||
9 | - # Add sys root specific cflags last | ||
10 | - $1_EXTRA_CFLAGS += $(SYSROOT_CFLAGS) | ||
11 | - $1_EXTRA_CXXFLAGS += $(SYSROOT_CFLAGS) | ||
12 | - | ||
13 | # Now call add_native_source for each source file we are going to compile. | ||
14 | $$(foreach p,$$($1_SRCS), \ | ||
15 | $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ | ||
16 | @@ -432,8 +428,6 @@ define SetupNativeCompilation | ||
17 | $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE)) | ||
18 | endif | ||
19 | |||
20 | - $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS) | ||
21 | - | ||
22 | $1 := $$($1_TARGET) | ||
23 | ifneq (,$$($1_LIBRARY)) | ||
24 | # Generating a dynamic library. | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch b/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch deleted file mode 100644 index e11c19c..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 1fa1097d45afa2fe2bfd989fbd90578f5c5fc540 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Mon, 13 Aug 2018 12:14:21 +0100 | ||
4 | Subject: [PATCH] hotspot/aarch64: fix undefined behaviour (gcc v8 fix) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Backport patch from | ||
10 | http://hg.openjdk.java.net/aarch64-port/jdk8u/hotspot/rev/253b0c304db6 | ||
11 | to address segfaults due to undefined behaviour. | ||
12 | |||
13 | |# HG changeset patch | ||
14 | |# User shade | ||
15 | |# Date 1526068247 -7200 | ||
16 | |# Node ID 253b0c304db6d31be3d3d7cf7cf1b3561a16dc3a | ||
17 | |# Parent 1ced2ae00e35e6f855175fc44500b37fbac9e314 | ||
18 | UB in os_linux_aarch64.cpp SpinPause | ||
19 | Reviewed-by: aph, shade, adinn | ||
20 | |||
21 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
22 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916] | ||
23 | --- | ||
24 | hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 1 + | ||
25 | 1 file changed, 1 insertion(+) | ||
26 | |||
27 | diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | ||
28 | index 8b985693..f536817e 100644 | ||
29 | --- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | ||
30 | +++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | ||
31 | @@ -699,6 +699,7 @@ void os::verify_stack_alignment() { | ||
32 | |||
33 | extern "C" { | ||
34 | int SpinPause() { | ||
35 | + return 0; | ||
36 | } | ||
37 | |||
38 | void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) { | ||
39 | -- | ||
40 | 2.18.0 | ||
41 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch b/recipes-core/openjdk/patches-openjdk-8/0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch deleted file mode 100644 index 467a1cd..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 3bd88f93a90876f8ead05de40816da0bd1e39aac Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Mon, 13 Aug 2018 11:49:26 +0100 | ||
4 | Subject: [PATCH] hotspot/zero: fix undefined behaviour (gcc v8 fix) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Backport patch from | ||
10 | https://bugs.openjdk.java.net/browse/JDK-8202600 | ||
11 | http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 | ||
12 | to address segfaults due to undefined behaviour. | ||
13 | |||
14 | |# HG changeset patch | ||
15 | |# User sgehwolf | ||
16 | |# Date 1525366788 -7200 | ||
17 | |# Node ID ca4663e589160509d6aef8ec890815e1330b97bc | ||
18 | |# Parent a27880c1288ba776f65748b68c198df97427f950 | ||
19 | 8202600: [Zero] Undefined behaviour in src/os_cpu/linux_zero/vm/os_linux_zero.cpp | ||
20 | Reviewed-by: stuefe, shade, dholmes | ||
21 | |||
22 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
23 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916] | ||
24 | --- | ||
25 | hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + | ||
26 | 1 file changed, 1 insertion(+) | ||
27 | |||
28 | diff --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 | ||
29 | index 1d069c6d..8dcf9d44 100644 | ||
30 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | ||
31 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | ||
32 | @@ -408,6 +408,7 @@ void os::print_register_info(outputStream *st, void *context) { | ||
33 | |||
34 | extern "C" { | ||
35 | int SpinPause() { | ||
36 | + return 0; // Shouldn't matter. | ||
37 | } | ||
38 | |||
39 | |||
40 | -- | ||
41 | 2.18.0 | ||
42 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch b/recipes-core/openjdk/patches-openjdk-8/0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch deleted file mode 100644 index 1421963..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From dbf31e2dfd00e20ab49af70f3533a348e8a6515e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Mon, 13 Aug 2018 16:47:25 +0100 | ||
4 | Subject: [PATCH 4/5] hotspot: Fix debug build after 8062808: Turn on the | ||
5 | -Wreturn-type warning | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | |# HG changeset patch | ||
11 | |# User goetz | ||
12 | |# Date 1415873641 -3600 | ||
13 | |# Thu Nov 13 11:14:01 2014 +0100 | ||
14 | |# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906 | ||
15 | |# Parent 533473c67de6ff767710594639033c8e83523fe5 | ||
16 | 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning | ||
17 | Reviewed-by: stefank, tschatzl | ||
18 | |||
19 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
20 | Upstream-Status: Backport | ||
21 | --- | ||
22 | hotspot/src/share/vm/prims/jni.cpp | 2 ++ | ||
23 | 1 file changed, 2 insertions(+) | ||
24 | |||
25 | diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp | ||
26 | index 6a6ab936..e2f2ad3b 100644 | ||
27 | --- a/hotspot/src/share/vm/prims/jni.cpp | ||
28 | +++ b/hotspot/src/share/vm/prims/jni.cpp | ||
29 | @@ -708,6 +708,7 @@ JNI_ENTRY(jint, jni_Throw(JNIEnv *env, jthrowable obj)) | ||
30 | |||
31 | THROW_OOP_(JNIHandles::resolve(obj), JNI_OK); | ||
32 | ShouldNotReachHere(); | ||
33 | + return 0; // Mute compiler. | ||
34 | JNI_END | ||
35 | |||
36 | #ifndef USDT2 | ||
37 | @@ -734,6 +735,7 @@ JNI_ENTRY(jint, jni_ThrowNew(JNIEnv *env, jclass clazz, const char *message)) | ||
38 | Handle protection_domain (THREAD, k->protection_domain()); | ||
39 | THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK); | ||
40 | ShouldNotReachHere(); | ||
41 | + return 0; // Mute compiler. | ||
42 | JNI_END | ||
43 | |||
44 | |||
45 | -- | ||
46 | 2.18.0 | ||
47 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch b/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch deleted file mode 100644 index f9feca0..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 90220d41f65910b108c901977eefe78fc1edecc5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nicola Lunghi <nicola.lunghi@jci.com> | ||
3 | Date: Mon, 17 Jun 2019 13:59:26 +0100 | ||
4 | Subject: [PATCH] Enable HotSpot builds on 5.x Linux kernels | ||
5 | |||
6 | 8217753: Enable HotSpot builds on 5.x Linux kernels | ||
7 | Summary: Remove Linux kernel version check as very unlikely a kernel older than 2.4 will be used. | ||
8 | Reviewed-by: erikj | ||
9 | |||
10 | Upstream-Status: Backport (http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c) | ||
11 | --- | ||
12 | hotspot/make/linux/Makefile | 15 +-------------- | ||
13 | 1 file changed, 1 insertion(+), 14 deletions(-) | ||
14 | |||
15 | diff --git a/hotspot/make/linux/Makefile b/hotspot/make/linux/Makefile | ||
16 | index 17c14097..e8f20104 100644 | ||
17 | --- a/hotspot/make/linux/Makefile | ||
18 | +++ b/hotspot/make/linux/Makefile | ||
19 | @@ -227,20 +227,7 @@ all: | ||
20 | @echo " $(TARGETS_SHARK)" | ||
21 | @echo " $(TARGETS_MINIMAL1)" | ||
22 | |||
23 | -checks: check_os_version check_j2se_version | ||
24 | - | ||
25 | -# We do not want people accidentally building on old systems (e.g. Linux 2.2.x, | ||
26 | -# Solaris 2.5.1, 2.6). | ||
27 | -# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. | ||
28 | - | ||
29 | -SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% | ||
30 | -OS_VERSION := $(shell uname -r) | ||
31 | -EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) | ||
32 | - | ||
33 | -check_os_version: | ||
34 | -ifeq ($(DISABLE_HOTSPOT_OS_VERSION_CHECK)$(EMPTY_IF_NOT_SUPPORTED),) | ||
35 | - $(QUIETLY) >&2 echo "*** This OS is not supported:" `uname -a`; exit 1; | ||
36 | -endif | ||
37 | +checks: check_j2se_version | ||
38 | |||
39 | # jvmti.make requires XSLT (J2SE 1.4.x or newer): | ||
40 | XSLT_CHECK = $(REMOTE) $(RUN.JAVAP) javax.xml.transform.TransformerFactory | ||
41 | -- | ||
42 | 2.20.1 | ||
43 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch index 4618b6b..280ee60 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d0ebd6f108df9b0f9533de6f16280ceec136d8e6 Mon Sep 17 00:00:00 2001 | 1 | From 5e8080a8dd56205f550f7c490f864c95dc8e509b Mon Sep 17 00:00:00 2001 |
2 | From: Wenlin Kang <wenlin.kang@windriver.com> | 2 | From: Wenlin Kang <wenlin.kang@windriver.com> |
3 | Date: Sun, 17 Feb 2019 22:38:33 -0800 | 3 | Date: Sun, 17 Feb 2019 22:38:33 -0800 |
4 | Subject: [PATCH] hotspot: fix crash on JNI_CreateJavaVM | 4 | Subject: [PATCH 1001/1012] hotspot: fix crash on JNI_CreateJavaVM |
5 | 5 | ||
6 | In function os::pd_create_stack_guard_pages(char* addr, size_t size), | 6 | In function os::pd_create_stack_guard_pages(char* addr, size_t size), |
7 | when addr < os::Linux::initial_thread_stack_bottom(), usually munmap() | 7 | when addr < os::Linux::initial_thread_stack_bottom(), usually munmap() |
@@ -13,15 +13,16 @@ cause segment(we have reproduced it on linux_PPC). | |||
13 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
14 | 14 | ||
15 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> | 15 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> |
16 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
16 | --- | 17 | --- |
17 | hotspot/src/os/linux/vm/os_linux.cpp | 3 ++- | 18 | src/os/linux/vm/os_linux.cpp | 3 ++- |
18 | 1 file changed, 2 insertions(+), 1 deletion(-) | 19 | 1 file changed, 2 insertions(+), 1 deletion(-) |
19 | 20 | ||
20 | diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp | 21 | diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp |
21 | index 044a70a6..b8246ce4 100644 | 22 | index 03cabfefb..4f28cc1fb 100644 |
22 | --- a/hotspot/src/os/linux/vm/os_linux.cpp | 23 | --- a/hotspot/src/os/linux/vm/os_linux.cpp |
23 | +++ b/hotspot/src/os/linux/vm/os_linux.cpp | 24 | +++ b/hotspot/src/os/linux/vm/os_linux.cpp |
24 | @@ -3078,7 +3078,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) { | 25 | @@ -3192,7 +3192,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) { |
25 | uintptr_t stack_extent = (uintptr_t) os::Linux::initial_thread_stack_bottom(); | 26 | uintptr_t stack_extent = (uintptr_t) os::Linux::initial_thread_stack_bottom(); |
26 | unsigned char vec[1]; | 27 | unsigned char vec[1]; |
27 | 28 | ||
@@ -32,5 +33,5 @@ index 044a70a6..b8246ce4 100644 | |||
32 | stack_extent = (uintptr_t) get_stack_commited_bottom( | 33 | stack_extent = (uintptr_t) get_stack_commited_bottom( |
33 | os::Linux::initial_thread_stack_bottom(), | 34 | os::Linux::initial_thread_stack_bottom(), |
34 | -- | 35 | -- |
35 | 2.17.1 | 36 | 2.24.1 |
36 | 37 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch index 45573e4..3f678dd 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 79e35bd203b40979e1d241a04d6d9df373327bef Mon Sep 17 00:00:00 2001 | 1 | From df566df123c8af8252c0e113c41c32482834923e Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 | 3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 |
4 | Subject: [PATCH 5/9] hotspot: use correct include for poll | 4 | Subject: [PATCH 1002/1012] hotspot: use correct include for poll |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -20,16 +20,18 @@ the following command: | |||
20 | done | 20 | done |
21 | 21 | ||
22 | Upstream-Status: Pending | 22 | Upstream-Status: Pending |
23 | |||
23 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 24 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
25 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
24 | --- | 26 | --- |
25 | hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- | 27 | src/os/aix/vm/os_aix.inline.hpp | 2 +- |
26 | hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- | 28 | src/os/bsd/vm/os_bsd.inline.hpp | 2 +- |
27 | hotspot/src/os/linux/vm/os_linux.inline.hpp | 2 +- | 29 | src/os/linux/vm/os_linux.inline.hpp | 2 +- |
28 | hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 2 +- | 30 | src/os/solaris/vm/os_solaris.inline.hpp | 2 +- |
29 | 4 files changed, 4 insertions(+), 4 deletions(-) | 31 | 4 files changed, 4 insertions(+), 4 deletions(-) |
30 | 32 | ||
31 | diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp | 33 | diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp |
32 | index a97c94c0..e2974ee1 100644 | 34 | index 421ea342e..9a1e1e096 100644 |
33 | --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp | 35 | --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp |
34 | +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp | 36 | +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp |
35 | @@ -34,7 +34,7 @@ | 37 | @@ -34,7 +34,7 @@ |
@@ -42,7 +44,7 @@ index a97c94c0..e2974ee1 100644 | |||
42 | #include <netdb.h> | 44 | #include <netdb.h> |
43 | 45 | ||
44 | diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 46 | diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
45 | index 10b39941..3144a29c 100644 | 47 | index c35abf486..8ff584aee 100644 |
46 | --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 48 | --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
47 | +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 49 | +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
48 | @@ -33,7 +33,7 @@ | 50 | @@ -33,7 +33,7 @@ |
@@ -55,7 +57,7 @@ index 10b39941..3144a29c 100644 | |||
55 | 57 | ||
56 | inline void* os::thread_local_storage_at(int index) { | 58 | inline void* os::thread_local_storage_at(int index) { |
57 | diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp | 59 | diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp |
58 | index 10d56d89..b9b2b775 100644 | 60 | index a23bd5631..9d56de0ef 100644 |
59 | --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp | 61 | --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp |
60 | +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp | 62 | +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp |
61 | @@ -33,7 +33,7 @@ | 63 | @@ -33,7 +33,7 @@ |
@@ -68,7 +70,7 @@ index 10d56d89..b9b2b775 100644 | |||
68 | 70 | ||
69 | inline void* os::thread_local_storage_at(int index) { | 71 | inline void* os::thread_local_storage_at(int index) { |
70 | diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 72 | diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
71 | index 921fcf7c..5d80a7d0 100644 | 73 | index 8e095ab69..ce37e9a12 100644 |
72 | --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 74 | --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
73 | +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 75 | +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
74 | @@ -33,7 +33,7 @@ | 76 | @@ -33,7 +33,7 @@ |
@@ -81,5 +83,5 @@ index 921fcf7c..5d80a7d0 100644 | |||
81 | #include <unistd.h> | 83 | #include <unistd.h> |
82 | #include <netdb.h> | 84 | #include <netdb.h> |
83 | -- | 85 | -- |
84 | 2.16.2 | 86 | 2.24.1 |
85 | 87 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch index f6af83e..8e31461 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4ed4b58270dcd3d897adef605893c104944c4f3a Mon Sep 17 00:00:00 2001 | 1 | From e5bf672f4e10997789f2a447fd95a88703dbd332 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 15:00:55 +0000 | 3 | Date: Tue, 27 Feb 2018 15:00:55 +0000 |
4 | Subject: [PATCH 6/9] hotspot: don't rely on old SysV SIGCLD | 4 | Subject: [PATCH 1003/1012] hotspot: don't rely on old SysV SIGCLD |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -17,13 +17,15 @@ leads to the following compilation error: | |||
17 | Just make it conditional, so the code compiles everywhere. | 17 | Just make it conditional, so the code compiles everywhere. |
18 | 18 | ||
19 | Upstream-Status: Pending | 19 | Upstream-Status: Pending |
20 | |||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 21 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
22 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
21 | --- | 23 | --- |
22 | hotspot/src/os/linux/vm/jvm_linux.cpp | 2 ++ | 24 | src/os/linux/vm/jvm_linux.cpp | 2 ++ |
23 | 1 file changed, 2 insertions(+) | 25 | 1 file changed, 2 insertions(+) |
24 | 26 | ||
25 | diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/hotspot/src/os/linux/vm/jvm_linux.cpp | 27 | diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/hotspot/src/os/linux/vm/jvm_linux.cpp |
26 | index ba84788a..c22281f7 100644 | 28 | index ba84788a1..c22281f7c 100644 |
27 | --- a/hotspot/src/os/linux/vm/jvm_linux.cpp | 29 | --- a/hotspot/src/os/linux/vm/jvm_linux.cpp |
28 | +++ b/hotspot/src/os/linux/vm/jvm_linux.cpp | 30 | +++ b/hotspot/src/os/linux/vm/jvm_linux.cpp |
29 | @@ -154,7 +154,9 @@ struct siglabel siglabels[] = { | 31 | @@ -154,7 +154,9 @@ struct siglabel siglabels[] = { |
@@ -37,5 +39,5 @@ index ba84788a..c22281f7 100644 | |||
37 | "CONT", SIGCONT, /* Continue (POSIX). */ | 39 | "CONT", SIGCONT, /* Continue (POSIX). */ |
38 | "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ | 40 | "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ |
39 | -- | 41 | -- |
40 | 2.16.2 | 42 | 2.24.1 |
41 | 43 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch index 4ab0d7a..ad480e3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From cc8fb308b36d323ee8a1e3a60e4c2ac006f710ab Mon Sep 17 00:00:00 2001 | 1 | From 3a6eef99b27b7dd750e7a02eb3ada71db99d9345 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 10 Aug 2018 14:54:45 +0100 | 3 | Date: Fri, 10 Aug 2018 14:54:45 +0100 |
4 | Subject: [PATCH] hotspot: backport patch to fix misuses of strncpy/strncat | 4 | Subject: [PATCH 1004/1012] hotspot: backport patch to fix misuses of |
5 | strncpy/strncat | ||
5 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 8 | Content-Transfer-Encoding: 8bit |
@@ -15,23 +16,22 @@ Fix them using a backport from openjdk-10 | |||
15 | Modelled after http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f | 16 | Modelled after http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f |
16 | 17 | ||
17 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 18 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
18 | 19 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | |
19 | --- | 20 | --- |
20 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f] | 21 | agent/src/os/linux/libproc_impl.c | 7 ++++++- |
21 | hotspot/agent/src/os/linux/libproc_impl.c | 7 ++++++- | 22 | src/share/tools/hsdis/hsdis.c | 1 + |
22 | hotspot/src/share/tools/hsdis/hsdis.c | 1 + | 23 | src/share/vm/compiler/compileBroker.hpp | 3 ++- |
23 | hotspot/src/share/vm/compiler/compileBroker.hpp | 3 ++- | 24 | src/share/vm/compiler/disassembler.cpp | 1 + |
24 | hotspot/src/share/vm/compiler/disassembler.cpp | 1 + | 25 | src/share/vm/runtime/arguments.cpp | 13 ++++++------- |
25 | hotspot/src/share/vm/runtime/arguments.cpp | 13 ++++++------- | 26 | src/share/vm/utilities/ostream.cpp | 12 ++++++++---- |
26 | hotspot/src/share/vm/utilities/ostream.cpp | 14 +++++++++----- | 27 | src/share/vm/utilities/vmError.cpp | 9 +-------- |
27 | hotspot/src/share/vm/utilities/vmError.cpp | 9 +-------- | 28 | 7 files changed, 25 insertions(+), 21 deletions(-) |
28 | 7 files changed, 26 insertions(+), 22 deletions(-) | ||
29 | 29 | ||
30 | diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c | 30 | diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c |
31 | index 2ea0d0f8..ab23fb16 100644 | 31 | index ca791c95d..73a15ce35 100644 |
32 | --- a/hotspot/agent/src/os/linux/libproc_impl.c | 32 | --- a/hotspot/agent/src/os/linux/libproc_impl.c |
33 | +++ b/hotspot/agent/src/os/linux/libproc_impl.c | 33 | +++ b/hotspot/agent/src/os/linux/libproc_impl.c |
34 | @@ -162,7 +162,12 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, | 34 | @@ -159,7 +159,12 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, |
35 | return NULL; | 35 | return NULL; |
36 | } | 36 | } |
37 | 37 | ||
@@ -46,10 +46,10 @@ index 2ea0d0f8..ab23fb16 100644 | |||
46 | 46 | ||
47 | if (fd == -1) { | 47 | if (fd == -1) { |
48 | diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c | 48 | diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c |
49 | index b56330e4..4e6fd9af 100644 | 49 | index 7bef1040f..1907d479e 100644 |
50 | --- a/hotspot/src/share/tools/hsdis/hsdis.c | 50 | --- a/hotspot/src/share/tools/hsdis/hsdis.c |
51 | +++ b/hotspot/src/share/tools/hsdis/hsdis.c | 51 | +++ b/hotspot/src/share/tools/hsdis/hsdis.c |
52 | @@ -410,6 +410,7 @@ static void parse_caller_options(struct hsdis_app_data* app_data, const char* ca | 52 | @@ -438,6 +438,7 @@ static void parse_caller_options(struct hsdis_app_data* app_data, const char* ca |
53 | } | 53 | } |
54 | p = q; | 54 | p = q; |
55 | } | 55 | } |
@@ -58,7 +58,7 @@ index b56330e4..4e6fd9af 100644 | |||
58 | 58 | ||
59 | static void print_help(struct hsdis_app_data* app_data, | 59 | static void print_help(struct hsdis_app_data* app_data, |
60 | diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp | 60 | diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp |
61 | index 7a381cd3..2aea6dd1 100644 | 61 | index ad37ff173..16e0ba3aa 100644 |
62 | --- a/hotspot/src/share/vm/compiler/compileBroker.hpp | 62 | --- a/hotspot/src/share/vm/compiler/compileBroker.hpp |
63 | +++ b/hotspot/src/share/vm/compiler/compileBroker.hpp | 63 | +++ b/hotspot/src/share/vm/compiler/compileBroker.hpp |
64 | @@ -173,7 +173,8 @@ class CompilerCounters : public CHeapObj<mtCompiler> { | 64 | @@ -173,7 +173,8 @@ class CompilerCounters : public CHeapObj<mtCompiler> { |
@@ -72,10 +72,10 @@ index 7a381cd3..2aea6dd1 100644 | |||
72 | } | 72 | } |
73 | 73 | ||
74 | diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp | 74 | diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp |
75 | index 69974763..111214a9 100644 | 75 | index 93cd9e854..e7b32cd6b 100644 |
76 | --- a/hotspot/src/share/vm/compiler/disassembler.cpp | 76 | --- a/hotspot/src/share/vm/compiler/disassembler.cpp |
77 | +++ b/hotspot/src/share/vm/compiler/disassembler.cpp | 77 | +++ b/hotspot/src/share/vm/compiler/disassembler.cpp |
78 | @@ -298,6 +298,7 @@ address decode_env::handle_event(const char* event, address arg) { | 78 | @@ -295,6 +295,7 @@ address decode_env::handle_event(const char* event, address arg) { |
79 | strlen((const char*)arg) > sizeof(buffer) - 1) { | 79 | strlen((const char*)arg) > sizeof(buffer) - 1) { |
80 | // Only print this when the mach changes | 80 | // Only print this when the mach changes |
81 | strncpy(buffer, (const char*)arg, sizeof(buffer) - 1); | 81 | strncpy(buffer, (const char*)arg, sizeof(buffer) - 1); |
@@ -84,10 +84,10 @@ index 69974763..111214a9 100644 | |||
84 | } | 84 | } |
85 | } else if (match(event, "format bytes-per-line")) { | 85 | } else if (match(event, "format bytes-per-line")) { |
86 | diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp | 86 | diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp |
87 | index cccff7a8..7589b443 100644 | 87 | index 2665b6b8c..5a9294677 100644 |
88 | --- a/hotspot/src/share/vm/runtime/arguments.cpp | 88 | --- a/hotspot/src/share/vm/runtime/arguments.cpp |
89 | +++ b/hotspot/src/share/vm/runtime/arguments.cpp | 89 | +++ b/hotspot/src/share/vm/runtime/arguments.cpp |
90 | @@ -3430,7 +3430,7 @@ void Arguments::fix_appclasspath() { | 90 | @@ -3455,7 +3455,7 @@ void Arguments::fix_appclasspath() { |
91 | } | 91 | } |
92 | 92 | ||
93 | char* copy = AllocateHeap(strlen(src) + 1, mtInternal); | 93 | char* copy = AllocateHeap(strlen(src) + 1, mtInternal); |
@@ -96,7 +96,7 @@ index cccff7a8..7589b443 100644 | |||
96 | 96 | ||
97 | // trim all trailing empty paths | 97 | // trim all trailing empty paths |
98 | for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) { | 98 | for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) { |
99 | @@ -3804,17 +3804,16 @@ static char* get_shared_archive_path() { | 99 | @@ -3834,17 +3834,16 @@ static char* get_shared_archive_path() { |
100 | if (end != NULL) *end = '\0'; | 100 | if (end != NULL) *end = '\0'; |
101 | size_t jvm_path_len = strlen(jvm_path); | 101 | size_t jvm_path_len = strlen(jvm_path); |
102 | size_t file_sep_len = strlen(os::file_separator()); | 102 | size_t file_sep_len = strlen(os::file_separator()); |
@@ -120,19 +120,10 @@ index cccff7a8..7589b443 100644 | |||
120 | } | 120 | } |
121 | return shared_archive_path; | 121 | return shared_archive_path; |
122 | diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp | 122 | diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp |
123 | index 44ce683d..bc3773fe 100644 | 123 | index 1b00f829a..4daea2b7e 100644 |
124 | --- a/hotspot/src/share/vm/utilities/ostream.cpp | 124 | --- a/hotspot/src/share/vm/utilities/ostream.cpp |
125 | +++ b/hotspot/src/share/vm/utilities/ostream.cpp | 125 | +++ b/hotspot/src/share/vm/utilities/ostream.cpp |
126 | @@ -112,7 +112,7 @@ const char* outputStream::do_vsnprintf(char* buffer, size_t buflen, | 126 | @@ -342,15 +342,19 @@ void stringStream::write(const char* s, size_t len) { |
127 | } | ||
128 | if (add_cr) { | ||
129 | if (result != buffer) { | ||
130 | - strncpy(buffer, result, buflen); | ||
131 | + memcpy(buffer, result, result_len); | ||
132 | result = buffer; | ||
133 | } | ||
134 | buffer[result_len++] = '\n'; | ||
135 | @@ -337,15 +337,19 @@ void stringStream::write(const char* s, size_t len) { | ||
136 | assert(rm == NULL || Thread::current()->current_resource_mark() == rm, | 127 | assert(rm == NULL || Thread::current()->current_resource_mark() == rm, |
137 | "stringStream is re-allocated with a different ResourceMark"); | 128 | "stringStream is re-allocated with a different ResourceMark"); |
138 | buffer = NEW_RESOURCE_ARRAY(char, end); | 129 | buffer = NEW_RESOURCE_ARRAY(char, end); |
@@ -157,10 +148,10 @@ index 44ce683d..bc3773fe 100644 | |||
157 | // Note that the following does not depend on write_len. | 148 | // Note that the following does not depend on write_len. |
158 | // This means that position and count get updated | 149 | // This means that position and count get updated |
159 | diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp | 150 | diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp |
160 | index 15f6bf48..4ab85f5d 100644 | 151 | index ef3bb5cee..c11fef472 100644 |
161 | --- a/hotspot/src/share/vm/utilities/vmError.cpp | 152 | --- a/hotspot/src/share/vm/utilities/vmError.cpp |
162 | +++ b/hotspot/src/share/vm/utilities/vmError.cpp | 153 | +++ b/hotspot/src/share/vm/utilities/vmError.cpp |
163 | @@ -421,14 +421,7 @@ void VMError::report(outputStream* st) { | 154 | @@ -450,14 +450,7 @@ void VMError::report(outputStream* st) { |
164 | #else | 155 | #else |
165 | const char *file = _filename; | 156 | const char *file = _filename; |
166 | #endif | 157 | #endif |
@@ -177,5 +168,5 @@ index 15f6bf48..4ab85f5d 100644 | |||
177 | st->print(" (0x%x)", _id); | 168 | st->print(" (0x%x)", _id); |
178 | } | 169 | } |
179 | -- | 170 | -- |
180 | 2.18.0 | 171 | 2.24.1 |
181 | 172 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0015-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch index fb7bb59..81177d0 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0015-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From f6424c46b4af08d0662eec1a5897d5502270a3b1 Mon Sep 17 00:00:00 2001 | 1 | From bce7b39095a839b8e77fe068e87150e855224705 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 13 Aug 2018 16:40:34 +0100 | 3 | Date: Mon, 13 Aug 2018 16:40:34 +0100 |
4 | Subject: [PATCH 1/5] hotspot: fix -Wreturn-type issues introduced by 8061651 | 4 | Subject: [PATCH 1005/1012] hotspot: fix -Wreturn-type issues introduced by |
5 | 8061651 | ||
5 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 8 | Content-Transfer-Encoding: 8bit |
@@ -14,17 +15,19 @@ Content-Transfer-Encoding: 8bit | |||
14 | |# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de | 15 | |# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de |
15 | PR3601: Fix additional -Wreturn-type issues introduced by 8061651 | 16 | PR3601: Fix additional -Wreturn-type issues introduced by 8061651 |
16 | 17 | ||
17 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
18 | Upstream-Status: Backport | 18 | Upstream-Status: Backport |
19 | |||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
19 | --- | 22 | --- |
20 | hotspot/src/share/vm/prims/jvm.cpp | 6 +++--- | 23 | src/share/vm/prims/jvm.cpp | 6 +++--- |
21 | 1 file changed, 3 insertions(+), 3 deletions(-) | 24 | 1 file changed, 3 insertions(+), 3 deletions(-) |
22 | 25 | ||
23 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp | 26 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp |
24 | index 07c36de8..067fd3ac 100644 | 27 | index f43dc5ed7..8d7523c55 100644 |
25 | --- a/hotspot/src/share/vm/prims/jvm.cpp | 28 | --- a/hotspot/src/share/vm/prims/jvm.cpp |
26 | +++ b/hotspot/src/share/vm/prims/jvm.cpp | 29 | +++ b/hotspot/src/share/vm/prims/jvm.cpp |
27 | @@ -835,7 +835,7 @@ JVM_END | 30 | @@ -908,7 +908,7 @@ JVM_END |
28 | JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname)) | 31 | JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname)) |
29 | JVMWrapper("JVM_KnownToNotExist"); | 32 | JVMWrapper("JVM_KnownToNotExist"); |
30 | #if INCLUDE_CDS | 33 | #if INCLUDE_CDS |
@@ -33,7 +36,7 @@ index 07c36de8..067fd3ac 100644 | |||
33 | #else | 36 | #else |
34 | return false; | 37 | return false; |
35 | #endif | 38 | #endif |
36 | @@ -845,7 +845,7 @@ JVM_END | 39 | @@ -918,7 +918,7 @@ JVM_END |
37 | JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)) | 40 | JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)) |
38 | JVMWrapper("JVM_GetResourceLookupCacheURLs"); | 41 | JVMWrapper("JVM_GetResourceLookupCacheURLs"); |
39 | #if INCLUDE_CDS | 42 | #if INCLUDE_CDS |
@@ -42,7 +45,7 @@ index 07c36de8..067fd3ac 100644 | |||
42 | #else | 45 | #else |
43 | return NULL; | 46 | return NULL; |
44 | #endif | 47 | #endif |
45 | @@ -855,7 +855,7 @@ JVM_END | 48 | @@ -928,7 +928,7 @@ JVM_END |
46 | JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name)) | 49 | JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name)) |
47 | JVMWrapper("JVM_GetResourceLookupCache"); | 50 | JVMWrapper("JVM_GetResourceLookupCache"); |
48 | #if INCLUDE_CDS | 51 | #if INCLUDE_CDS |
@@ -52,5 +55,5 @@ index 07c36de8..067fd3ac 100644 | |||
52 | return NULL; | 55 | return NULL; |
53 | #endif | 56 | #endif |
54 | -- | 57 | -- |
55 | 2.18.0 | 58 | 2.24.1 |
56 | 59 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch index d6bedbc..38067cb 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 43c1f744e5f6171df3158baf88dd0a64c4b5e439 Mon Sep 17 00:00:00 2001 | 1 | From 84fc6448f44cd45a5448d0e88df8ccabfa10dcc5 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 13 Aug 2018 16:45:24 +0100 | 3 | Date: Mon, 13 Aug 2018 16:45:24 +0100 |
4 | Subject: [PATCH 2/5] hotspot: Zero build requires disabled warnings | 4 | Subject: [PATCH 1006/1012] hotspot: Zero build requires disabled warnings |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -15,17 +15,19 @@ Content-Transfer-Encoding: 8bit | |||
15 | 8143245, PR3548: Zero build requires disabled warnings | 15 | 8143245, PR3548: Zero build requires disabled warnings |
16 | Reviewed-by: dholmes, coleenp | 16 | Reviewed-by: dholmes, coleenp |
17 | 17 | ||
18 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
19 | Upstream-Status: Backport | 18 | Upstream-Status: Backport |
19 | |||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
20 | --- | 22 | --- |
21 | hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- | 23 | src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- |
22 | hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- | 24 | src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- |
23 | .../src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 16 +++++++++++++--- | 25 | src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++-- |
24 | .../os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- | 26 | src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- |
25 | 4 files changed, 18 insertions(+), 7 deletions(-) | 27 | 4 files changed, 17 insertions(+), 6 deletions(-) |
26 | 28 | ||
27 | diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 29 | diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
28 | index 242ce1cf..065471af 100644 | 30 | index 525031eb9..d47422b8c 100644 |
29 | --- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 31 | --- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
30 | +++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 32 | +++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
31 | @@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { | 33 | @@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { |
@@ -38,7 +40,7 @@ index 242ce1cf..065471af 100644 | |||
38 | } | 40 | } |
39 | 41 | ||
40 | diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 42 | diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
41 | index e23e3eaa..061ed8ce 100644 | 43 | index e23e3eaa9..061ed8ce8 100644 |
42 | --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 44 | --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
43 | +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 45 | +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
44 | @@ -1,5 +1,5 @@ | 46 | @@ -1,5 +1,5 @@ |
@@ -58,17 +60,9 @@ index e23e3eaa..061ed8ce 100644 | |||
58 | case T_VOID: | 60 | case T_VOID: |
59 | ftype = &ffi_type_void; | 61 | ftype = &ffi_type_void; |
60 | diff --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 | 62 | diff --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 |
61 | index 8dcf9d44..508eb172 100644 | 63 | index d22ea1141..cbee43baa 100644 |
62 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 64 | --- 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 | 65 | +++ 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() { | 66 | @@ -61,6 +61,7 @@ address os::current_stack_pointer() { |
73 | 67 | ||
74 | frame os::get_sender_for_C_frame(frame* fr) { | 68 | frame os::get_sender_for_C_frame(frame* fr) { |
@@ -125,7 +119,7 @@ index 8dcf9d44..508eb172 100644 | |||
125 | 119 | ||
126 | void os::Linux::set_fpu_control_word(int fpu) { | 120 | void os::Linux::set_fpu_control_word(int fpu) { |
127 | diff --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 | 121 | diff --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 |
128 | index 39f77f85..b9c73dc4 100644 | 122 | index 39f77f858..b9c73dc48 100644 |
129 | --- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 123 | --- 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 | 124 | +++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp |
131 | @@ -1,5 +1,5 @@ | 125 | @@ -1,5 +1,5 @@ |
@@ -144,5 +138,5 @@ index 39f77f85..b9c73dc4 100644 | |||
144 | 138 | ||
145 | // These routines are only used on cpu architectures that | 139 | // These routines are only used on cpu architectures that |
146 | -- | 140 | -- |
147 | 2.18.0 | 141 | 2.24.1 |
148 | 142 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch index 001e905..6692200 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6e1d92639787ac8f506f810776a3f1c35f2cd070 Mon Sep 17 00:00:00 2001 | 1 | From 996a1e3d53773f41e9098117a69a060722972269 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 13 Aug 2018 16:46:33 +0100 | 3 | Date: Mon, 13 Aug 2018 16:46:33 +0100 |
4 | Subject: [PATCH 3/5] hotspot: Missing return statement in | 4 | Subject: [PATCH 1007/1012] hotspot: Missing return statement in |
5 | __sync_val_compare_and_swap_8 | 5 | __sync_val_compare_and_swap_8 |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -17,15 +17,17 @@ Content-Transfer-Encoding: 8bit | |||
17 | Summary: Fix issue discovered by -Wreturn-type on systems without LP64. | 17 | Summary: Fix issue discovered by -Wreturn-type on systems without LP64. |
18 | Reviewed-by: aph | 18 | Reviewed-by: aph |
19 | 19 | ||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
21 | Upstream-Status: Backport | 20 | Upstream-Status: Backport |
21 | |||
22 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
22 | --- | 24 | --- |
23 | hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + | 25 | src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + |
24 | hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + | 26 | src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + |
25 | 2 files changed, 2 insertions(+) | 27 | 2 files changed, 2 insertions(+) |
26 | 28 | ||
27 | diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 29 | diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
28 | index c857b552..4aaf78b1 100644 | 30 | index c857b5526..4aaf78b1d 100644 |
29 | --- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 31 | --- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
30 | +++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 32 | +++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
31 | @@ -457,6 +457,7 @@ extern "C" { | 33 | @@ -457,6 +457,7 @@ extern "C" { |
@@ -37,7 +39,7 @@ index c857b552..4aaf78b1 100644 | |||
37 | }; | 39 | }; |
38 | #endif // !_LP64 | 40 | #endif // !_LP64 |
39 | diff --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 | 41 | diff --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 |
40 | index 508eb172..bb8fa1f1 100644 | 42 | index cbee43baa..136d4d3de 100644 |
41 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 43 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
42 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 44 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
43 | @@ -498,6 +498,7 @@ extern "C" { | 45 | @@ -498,6 +498,7 @@ extern "C" { |
@@ -49,5 +51,5 @@ index 508eb172..bb8fa1f1 100644 | |||
49 | }; | 51 | }; |
50 | #endif // !_LP64 | 52 | #endif // !_LP64 |
51 | -- | 53 | -- |
52 | 2.18.0 | 54 | 2.24.1 |
53 | 55 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0019-hotspot-Turn-on-the-Wreturn-type-warning.patch b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch index 0156978..10dd0f7 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0019-hotspot-Turn-on-the-Wreturn-type-warning.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From cc0d371f17c0ab060eb1e6b42d4bf053a2cbc3ba Mon Sep 17 00:00:00 2001 | 1 | From 2cce90259f9de7b5fba7f3380cdc90b3a586aa75 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 13 Aug 2018 16:48:32 +0100 | 3 | Date: Mon, 13 Aug 2018 16:48:32 +0100 |
4 | Subject: [PATCH 5/5] hotspot: Turn on the -Wreturn-type warning | 4 | Subject: [PATCH 1008/1012] hotspot: Turn on the -Wreturn-type warning |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -15,29 +15,31 @@ Content-Transfer-Encoding: 8bit | |||
15 | 8062808, PR3548: Turn on the -Wreturn-type warning | 15 | 8062808, PR3548: Turn on the -Wreturn-type warning |
16 | Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett | 16 | Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett |
17 | 17 | ||
18 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
19 | Upstream-Status: Backport | 18 | Upstream-Status: Backport |
19 | |||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
20 | --- | 22 | --- |
21 | hotspot/make/linux/makefiles/gcc.make | 2 +- | 23 | make/linux/makefiles/gcc.make | 2 +- |
22 | hotspot/src/cpu/x86/vm/x86_32.ad | 1 + | 24 | src/cpu/x86/vm/x86_32.ad | 1 + |
23 | hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 + | 25 | src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 + |
24 | hotspot/src/share/vm/classfile/defaultMethods.cpp | 4 ++-- | 26 | src/share/vm/classfile/defaultMethods.cpp | 4 ++-- |
25 | hotspot/src/share/vm/classfile/symbolTable.cpp | 4 ++-- | 27 | src/share/vm/classfile/symbolTable.cpp | 4 ++-- |
26 | hotspot/src/share/vm/classfile/systemDictionary.cpp | 6 +++--- | 28 | src/share/vm/classfile/systemDictionary.cpp | 6 +++--- |
27 | hotspot/src/share/vm/memory/heapInspection.hpp | 2 +- | 29 | src/share/vm/memory/heapInspection.hpp | 2 +- |
28 | hotspot/src/share/vm/memory/metaspaceShared.hpp | 2 +- | 30 | src/share/vm/memory/metaspaceShared.hpp | 2 +- |
29 | hotspot/src/share/vm/oops/constantPool.hpp | 2 +- | 31 | src/share/vm/oops/constantPool.hpp | 2 +- |
30 | hotspot/src/share/vm/prims/jvm.cpp | 2 +- | 32 | src/share/vm/prims/jvm.cpp | 2 +- |
31 | hotspot/src/share/vm/runtime/reflection.cpp | 2 +- | 33 | src/share/vm/runtime/reflection.cpp | 2 +- |
32 | hotspot/src/share/vm/runtime/sharedRuntime.cpp | 2 +- | 34 | src/share/vm/runtime/sharedRuntime.cpp | 2 +- |
33 | hotspot/src/share/vm/services/memTracker.hpp | 2 +- | 35 | src/share/vm/services/memTracker.hpp | 2 +- |
34 | 13 files changed, 17 insertions(+), 15 deletions(-) | 36 | 13 files changed, 17 insertions(+), 15 deletions(-) |
35 | 37 | ||
36 | diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make | 38 | diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make |
37 | index 272afcea..157afff2 100644 | 39 | index 36b3c8ba9..cd9511e50 100644 |
38 | --- a/hotspot/make/linux/makefiles/gcc.make | 40 | --- a/hotspot/make/linux/makefiles/gcc.make |
39 | +++ b/hotspot/make/linux/makefiles/gcc.make | 41 | +++ b/hotspot/make/linux/makefiles/gcc.make |
40 | @@ -207,7 +207,7 @@ ifeq ($(USE_CLANG), true) | 42 | @@ -211,7 +211,7 @@ ifeq ($(USE_CLANG), true) |
41 | WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body | 43 | WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body |
42 | endif | 44 | endif |
43 | 45 | ||
@@ -47,7 +49,7 @@ index 272afcea..157afff2 100644 | |||
47 | ifeq ($(USE_CLANG),) | 49 | ifeq ($(USE_CLANG),) |
48 | # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit | 50 | # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit |
49 | diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad | 51 | diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad |
50 | index f42d1a28..c8f4ee16 100644 | 52 | index f42d1a288..c8f4ee161 100644 |
51 | --- a/hotspot/src/cpu/x86/vm/x86_32.ad | 53 | --- a/hotspot/src/cpu/x86/vm/x86_32.ad |
52 | +++ b/hotspot/src/cpu/x86/vm/x86_32.ad | 54 | +++ b/hotspot/src/cpu/x86/vm/x86_32.ad |
53 | @@ -1250,6 +1250,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo | 55 | @@ -1250,6 +1250,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo |
@@ -59,7 +61,7 @@ index f42d1a28..c8f4ee16 100644 | |||
59 | 61 | ||
60 | #ifndef PRODUCT | 62 | #ifndef PRODUCT |
61 | diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 63 | diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp |
62 | index fb96738a..4cdeb372 100644 | 64 | index 1a7375afc..fbf51b040 100644 |
63 | --- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 65 | --- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp |
64 | +++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 66 | +++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp |
65 | @@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig, | 67 | @@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig, |
@@ -71,7 +73,7 @@ index fb96738a..4cdeb372 100644 | |||
71 | 73 | ||
72 | void os::Linux::init_thread_fpu_state(void) { | 74 | void os::Linux::init_thread_fpu_state(void) { |
73 | diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp | 75 | diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp |
74 | index 0e3d5d7b..d3df1d15 100644 | 76 | index 4b4b4e250..196622aed 100644 |
75 | --- a/hotspot/src/share/vm/classfile/defaultMethods.cpp | 77 | --- a/hotspot/src/share/vm/classfile/defaultMethods.cpp |
76 | +++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp | 78 | +++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp |
77 | @@ -506,7 +506,7 @@ Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method | 79 | @@ -506,7 +506,7 @@ Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method |
@@ -93,7 +95,7 @@ index 0e3d5d7b..d3df1d15 100644 | |||
93 | 95 | ||
94 | 96 | ||
95 | diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp | 97 | diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp |
96 | index ec97077b..2621a7d6 100644 | 98 | index ec97077b7..2621a7d62 100644 |
97 | --- a/hotspot/src/share/vm/classfile/symbolTable.cpp | 99 | --- a/hotspot/src/share/vm/classfile/symbolTable.cpp |
98 | +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp | 100 | +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp |
99 | @@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { | 101 | @@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
@@ -115,7 +117,7 @@ index ec97077b..2621a7d6 100644 | |||
115 | 117 | ||
116 | Symbol* SymbolTable::lookup_only(const char* name, int len, | 118 | Symbol* SymbolTable::lookup_only(const char* name, int len, |
117 | diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp | 119 | diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp |
118 | index 8d2e7f49..62bdba3e 100644 | 120 | index da2717d36..5253afc22 100644 |
119 | --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp | 121 | --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp |
120 | +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp | 122 | +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp |
121 | @@ -229,15 +229,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader | 123 | @@ -229,15 +229,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader |
@@ -138,7 +140,7 @@ index 8d2e7f49..62bdba3e 100644 | |||
138 | } | 140 | } |
139 | 141 | ||
140 | diff --git a/hotspot/src/share/vm/memory/heapInspection.hpp b/hotspot/src/share/vm/memory/heapInspection.hpp | 142 | diff --git a/hotspot/src/share/vm/memory/heapInspection.hpp b/hotspot/src/share/vm/memory/heapInspection.hpp |
141 | index 09ee6602..c5fec15c 100644 | 143 | index 09ee6602e..c5fec15c3 100644 |
142 | --- a/hotspot/src/share/vm/memory/heapInspection.hpp | 144 | --- a/hotspot/src/share/vm/memory/heapInspection.hpp |
143 | +++ b/hotspot/src/share/vm/memory/heapInspection.hpp | 145 | +++ b/hotspot/src/share/vm/memory/heapInspection.hpp |
144 | @@ -367,7 +367,7 @@ class HeapInspection : public StackObj { | 146 | @@ -367,7 +367,7 @@ class HeapInspection : public StackObj { |
@@ -151,7 +153,7 @@ index 09ee6602..c5fec15c 100644 | |||
151 | private: | 153 | private: |
152 | void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL); | 154 | void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL); |
153 | diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/hotspot/src/share/vm/memory/metaspaceShared.hpp | 155 | diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/hotspot/src/share/vm/memory/metaspaceShared.hpp |
154 | index 2f3abae6..d58ebecb 100644 | 156 | index 2f3abae6a..d58ebecb2 100644 |
155 | --- a/hotspot/src/share/vm/memory/metaspaceShared.hpp | 157 | --- a/hotspot/src/share/vm/memory/metaspaceShared.hpp |
156 | +++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp | 158 | +++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp |
157 | @@ -93,7 +93,7 @@ class MetaspaceShared : AllStatic { | 159 | @@ -93,7 +93,7 @@ class MetaspaceShared : AllStatic { |
@@ -164,10 +166,10 @@ index 2f3abae6..d58ebecb 100644 | |||
164 | static ReservedSpace* shared_rs() { | 166 | static ReservedSpace* shared_rs() { |
165 | CDS_ONLY(return _shared_rs); | 167 | CDS_ONLY(return _shared_rs); |
166 | diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp | 168 | diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp |
167 | index f170decc..a1e168b2 100644 | 169 | index 0698eb40e..354293924 100644 |
168 | --- a/hotspot/src/share/vm/oops/constantPool.hpp | 170 | --- a/hotspot/src/share/vm/oops/constantPool.hpp |
169 | +++ b/hotspot/src/share/vm/oops/constantPool.hpp | 171 | +++ b/hotspot/src/share/vm/oops/constantPool.hpp |
170 | @@ -349,7 +349,7 @@ class ConstantPool : public Metadata { | 172 | @@ -350,7 +350,7 @@ class ConstantPool : public Metadata { |
171 | 173 | ||
172 | Klass* klass_at(int which, TRAPS) { | 174 | Klass* klass_at(int which, TRAPS) { |
173 | constantPoolHandle h_this(THREAD, this); | 175 | constantPoolHandle h_this(THREAD, this); |
@@ -177,10 +179,10 @@ index f170decc..a1e168b2 100644 | |||
177 | 179 | ||
178 | Symbol* klass_name_at(int which); // Returns the name, w/o resolving. | 180 | Symbol* klass_name_at(int which); // Returns the name, w/o resolving. |
179 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp | 181 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp |
180 | index 067fd3ac..b9e5b322 100644 | 182 | index 8d7523c55..4034a8589 100644 |
181 | --- a/hotspot/src/share/vm/prims/jvm.cpp | 183 | --- a/hotspot/src/share/vm/prims/jvm.cpp |
182 | +++ b/hotspot/src/share/vm/prims/jvm.cpp | 184 | +++ b/hotspot/src/share/vm/prims/jvm.cpp |
183 | @@ -4280,7 +4280,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( | 185 | @@ -4343,7 +4343,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( |
184 | JVM_DTraceProvider* providers)) | 186 | JVM_DTraceProvider* providers)) |
185 | JVMWrapper("JVM_DTraceActivate"); | 187 | JVMWrapper("JVM_DTraceActivate"); |
186 | return DTraceJSDT::activate( | 188 | return DTraceJSDT::activate( |
@@ -190,7 +192,7 @@ index 067fd3ac..b9e5b322 100644 | |||
190 | 192 | ||
191 | JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method)) | 193 | JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method)) |
192 | diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp | 194 | diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp |
193 | index e2f282ee..679e1775 100644 | 195 | index 4b39d8ccb..9cd7b0dcb 100644 |
194 | --- a/hotspot/src/share/vm/runtime/reflection.cpp | 196 | --- a/hotspot/src/share/vm/runtime/reflection.cpp |
195 | +++ b/hotspot/src/share/vm/runtime/reflection.cpp | 197 | +++ b/hotspot/src/share/vm/runtime/reflection.cpp |
196 | @@ -1093,7 +1093,7 @@ oop Reflection::invoke(instanceKlassHandle klass, methodHandle reflected_method, | 198 | @@ -1093,7 +1093,7 @@ oop Reflection::invoke(instanceKlassHandle klass, methodHandle reflected_method, |
@@ -203,10 +205,10 @@ index e2f282ee..679e1775 100644 | |||
203 | } | 205 | } |
204 | 206 | ||
205 | diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp | 207 | diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp |
206 | index 8ffa8ab3..219bcd5c 100644 | 208 | index d5bea29c3..50578ad63 100644 |
207 | --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp | 209 | --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp |
208 | +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp | 210 | +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp |
209 | @@ -1038,7 +1038,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, | 211 | @@ -1041,7 +1041,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, |
210 | // last java frame on stack (which includes native call frames) | 212 | // last java frame on stack (which includes native call frames) |
211 | vframeStream vfst(thread, true); // Do not skip and javaCalls | 213 | vframeStream vfst(thread, true); // Do not skip and javaCalls |
212 | 214 | ||
@@ -216,7 +218,7 @@ index 8ffa8ab3..219bcd5c 100644 | |||
216 | 218 | ||
217 | 219 | ||
218 | diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp | 220 | diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp |
219 | index 38a027ea..13436a4b 100644 | 221 | index 7ad2b71f4..182084373 100644 |
220 | --- a/hotspot/src/share/vm/services/memTracker.hpp | 222 | --- a/hotspot/src/share/vm/services/memTracker.hpp |
221 | +++ b/hotspot/src/share/vm/services/memTracker.hpp | 223 | +++ b/hotspot/src/share/vm/services/memTracker.hpp |
222 | @@ -64,7 +64,7 @@ class MemTracker : AllStatic { | 224 | @@ -64,7 +64,7 @@ class MemTracker : AllStatic { |
@@ -229,5 +231,5 @@ index 38a027ea..13436a4b 100644 | |||
229 | static inline void record_thread_stack(void* addr, size_t size) { } | 231 | static inline void record_thread_stack(void* addr, size_t size) { } |
230 | static inline void release_thread_stack(void* addr, size_t size) { } | 232 | static inline void release_thread_stack(void* addr, size_t size) { } |
231 | -- | 233 | -- |
232 | 2.18.0 | 234 | 2.24.1 |
233 | 235 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch new file mode 100644 index 0000000..ee950cd --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From d085dcce6f8700fd8ddda475357496ea6da323dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> | ||
3 | Date: Fri, 21 Sep 2018 10:44:06 +0200 | ||
4 | Subject: [PATCH 1009/1012] hotspot: handle format error for GCC >= 7 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> | ||
9 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
10 | --- | ||
11 | src/share/vm/adlc/output_c.cpp | 6 ++++-- | ||
12 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp | ||
15 | index b3766636d..eba08d2f0 100644 | ||
16 | --- a/hotspot/src/share/vm/adlc/output_c.cpp | ||
17 | +++ b/hotspot/src/share/vm/adlc/output_c.cpp | ||
18 | @@ -436,9 +436,11 @@ static int pipeline_res_mask_initializer( | ||
19 | for (i = maxcycleused; i > 0; i /= 10) | ||
20 | cycledigit++; | ||
21 | |||
22 | - int maskdigit = 0; | ||
23 | - for (i = rescount; i > 0; i /= 10) | ||
24 | + int maskdigit = 1; | ||
25 | + for (i = rescount / 10; i > 0; i /= 10) | ||
26 | maskdigit++; | ||
27 | + if (maskdigit > 10) | ||
28 | + maskdigit = 10; | ||
29 | |||
30 | static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; | ||
31 | static const char* pipeline_use_element = "Pipeline_Use_Element"; | ||
32 | -- | ||
33 | 2.24.1 | ||
34 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch index fa26d04..03f8660 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch | |||
@@ -1,22 +1,30 @@ | |||
1 | From 89408e465d92657de8c54d4622f1810c28c3d700 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> | ||
3 | Date: Thu, 2 Jan 2020 10:19:29 +0100 | ||
4 | Subject: [PATCH 1010/1012] hotspot: fix adlc flags | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
1 | adlc is built using the native toolchain, not the crosscompiler. It however | 9 | adlc is built using the native toolchain, not the crosscompiler. It however |
2 | was incorrectly using flags meant for the crosscompiler. | 10 | was incorrectly using flags meant for the crosscompiler. |
3 | 11 | ||
4 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> | ||
5 | |||
6 | Upstream-Status: Inappropriate [Yocto-specific fixes] | 12 | Upstream-Status: Inappropriate [Yocto-specific fixes] |
7 | 13 | ||
14 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> | ||
15 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
8 | --- | 16 | --- |
9 | hotspot/make/linux/makefiles/adlc.make | 10 ++++++++++ | 17 | make/linux/makefiles/adlc.make | 10 ++++++++++ |
10 | 1 file changed, 10 insertions(+) | 18 | 1 file changed, 10 insertions(+) |
11 | 19 | ||
12 | diff --git hotspot/make/linux/makefiles/adlc.make hotspot/make/linux/makefiles/adlc.make | 20 | diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make |
13 | index 8a86691..2789c03 100644 | 21 | index 92b8b9b39..ae0aa0082 100644 |
14 | --- hotspot/make/linux/makefiles/adlc.make | 22 | --- a/hotspot/make/linux/makefiles/adlc.make |
15 | +++ hotspot/make/linux/makefiles/adlc.make | 23 | +++ b/hotspot/make/linux/makefiles/adlc.make |
16 | @@ -28,6 +28,16 @@ | 24 | @@ -28,6 +28,16 @@ |
17 | 25 | ||
18 | include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make | 26 | include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make |
19 | 27 | ||
20 | +# Yocto specific fix - remove target machine flags and replace them with | 28 | +# Yocto specific fix - remove target machine flags and replace them with |
21 | +# build machine flags, as this part is built using the native toolchain | 29 | +# build machine flags, as this part is built using the native toolchain |
22 | +CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS)) | 30 | +CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS)) |
@@ -28,7 +36,8 @@ index 8a86691..2789c03 100644 | |||
28 | + | 36 | + |
29 | + | 37 | + |
30 | # ######################################################################### | 38 | # ######################################################################### |
31 | 39 | ||
32 | # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: | 40 | # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: |
33 | -- | 41 | -- |
34 | 1.9.1 | 42 | 2.24.1 |
43 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch index ece7f14..8fe5489 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch | |||
@@ -1,6 +1,31 @@ | |||
1 | --- hotspot/make/Makefile.orig | 1 | From 1015cc718ba25cabf613b96fd58baa8dfb8492fe Mon Sep 17 00:00:00 2001 |
2 | +++ hotspot/make/Makefile | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | @@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD | 3 | Date: Thu, 2 Jan 2020 10:22:19 +0100 |
4 | Subject: [PATCH 1011/1012] hotspot: fix shark build (common) | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | make/Makefile | 2 +- | ||
9 | src/cpu/zero/vm/interpreter_zero.cpp | 2 +- | ||
10 | src/share/vm/ci/ciTypeFlow.cpp | 4 ++ | ||
11 | src/share/vm/classfile/systemDictionary.cpp | 4 ++ | ||
12 | src/share/vm/runtime/handles.inline.hpp | 8 +++- | ||
13 | src/share/vm/shark/llvmHeaders.hpp | 4 ++ | ||
14 | src/share/vm/shark/sharkCompiler.cpp | 39 ++++++++++++++++--- | ||
15 | src/share/vm/shark/sharkCompiler.hpp | 2 + | ||
16 | src/share/vm/shark/sharkContext.cpp | 9 ++++- | ||
17 | src/share/vm/shark/sharkContext.hpp | 43 ++++++++++++++++++++- | ||
18 | src/share/vm/shark/sharkEntry.hpp | 1 + | ||
19 | src/share/vm/shark/sharkIntrinsics.cpp | 4 ++ | ||
20 | src/share/vm/shark/sharkRuntime.cpp | 1 + | ||
21 | src/share/vm/shark/sharkTopLevelBlock.cpp | 12 ++++++ | ||
22 | 14 files changed, 123 insertions(+), 12 deletions(-) | ||
23 | |||
24 | diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile | ||
25 | index 5765f1e36..f8ff9ecd9 100644 | ||
26 | --- a/hotspot/make/Makefile | ||
27 | +++ b/hotspot/make/Makefile | ||
28 | @@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/% | ||
4 | # Unix | 29 | # Unix |
5 | $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX) | 30 | $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX) |
6 | $(install-file) | 31 | $(install-file) |
@@ -9,8 +34,23 @@ | |||
9 | $(install-file) | 34 | $(install-file) |
10 | $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz | 35 | $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz |
11 | $(install-file) | 36 | $(install-file) |
12 | --- hotspot/src/share/vm/ci/ciTypeFlow.cpp.orig | 37 | diff --git a/hotspot/src/cpu/zero/vm/interpreter_zero.cpp b/hotspot/src/cpu/zero/vm/interpreter_zero.cpp |
13 | +++ hotspot/src/share/vm/ci/ciTypeFlow.cpp | 38 | index 7172443db..5a4b4ad56 100644 |
39 | --- a/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | ||
40 | +++ b/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | ||
41 | @@ -49,7 +49,7 @@ | ||
42 | #ifdef COMPILER1 | ||
43 | #include "c1/c1_Runtime1.hpp" | ||
44 | #endif | ||
45 | -#ifdef CC_INTERP | ||
46 | +#if defined(CC_INTERP) || defined(SHARK) | ||
47 | #include "interpreter/cppInterpreter.hpp" | ||
48 | #endif | ||
49 | |||
50 | diff --git a/hotspot/src/share/vm/ci/ciTypeFlow.cpp b/hotspot/src/share/vm/ci/ciTypeFlow.cpp | ||
51 | index 4707cc96e..a2b297ca0 100644 | ||
52 | --- a/hotspot/src/share/vm/ci/ciTypeFlow.cpp | ||
53 | +++ b/hotspot/src/share/vm/ci/ciTypeFlow.cpp | ||
14 | @@ -35,8 +35,10 @@ | 54 | @@ -35,8 +35,10 @@ |
15 | #include "interpreter/bytecode.hpp" | 55 | #include "interpreter/bytecode.hpp" |
16 | #include "interpreter/bytecodes.hpp" | 56 | #include "interpreter/bytecodes.hpp" |
@@ -22,7 +62,7 @@ | |||
22 | #include "runtime/deoptimization.hpp" | 62 | #include "runtime/deoptimization.hpp" |
23 | #include "utilities/growableArray.hpp" | 63 | #include "utilities/growableArray.hpp" |
24 | 64 | ||
25 | @@ -2648,6 +2650,7 @@ void ciTypeFlow::df_flow_types(Block* st | 65 | @@ -2648,6 +2650,7 @@ void ciTypeFlow::df_flow_types(Block* start, |
26 | assert (!blk->has_pre_order(), ""); | 66 | assert (!blk->has_pre_order(), ""); |
27 | blk->set_next_pre_order(); | 67 | blk->set_next_pre_order(); |
28 | 68 | ||
@@ -30,7 +70,7 @@ | |||
30 | if (_next_pre_order >= (int)Compile::current()->max_node_limit() / 2) { | 70 | if (_next_pre_order >= (int)Compile::current()->max_node_limit() / 2) { |
31 | // Too many basic blocks. Bail out. | 71 | // Too many basic blocks. Bail out. |
32 | // This can happen when try/finally constructs are nested to depth N, | 72 | // This can happen when try/finally constructs are nested to depth N, |
33 | @@ -2657,6 +2660,7 @@ void ciTypeFlow::df_flow_types(Block* st | 73 | @@ -2657,6 +2660,7 @@ void ciTypeFlow::df_flow_types(Block* start, |
34 | record_failure("too many basic blocks"); | 74 | record_failure("too many basic blocks"); |
35 | return; | 75 | return; |
36 | } | 76 | } |
@@ -38,9 +78,11 @@ | |||
38 | if (do_flow) { | 78 | if (do_flow) { |
39 | flow_block(blk, temp_vector, temp_set); | 79 | flow_block(blk, temp_vector, temp_set); |
40 | if (failing()) return; // Watch for bailouts. | 80 | if (failing()) return; // Watch for bailouts. |
41 | --- hotspot/src/share/vm/classfile/systemDictionary.cpp.orig | 81 | diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp |
42 | +++ hotspot/src/share/vm/classfile/systemDictionary.cpp | 82 | index 5253afc22..ecb30cdef 100644 |
43 | @@ -2289,6 +2289,7 @@ methodHandle SystemDictionary::find_meth | 83 | --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp |
84 | +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp | ||
85 | @@ -2300,6 +2300,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid | ||
44 | spe = NULL; | 86 | spe = NULL; |
45 | // Must create lots of stuff here, but outside of the SystemDictionary lock. | 87 | // Must create lots of stuff here, but outside of the SystemDictionary lock. |
46 | m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); | 88 | m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); |
@@ -48,7 +90,7 @@ | |||
48 | if (!Arguments::is_interpreter_only()) { | 90 | if (!Arguments::is_interpreter_only()) { |
49 | // Generate a compiled form of the MH intrinsic. | 91 | // Generate a compiled form of the MH intrinsic. |
50 | AdapterHandlerLibrary::create_native_wrapper(m); | 92 | AdapterHandlerLibrary::create_native_wrapper(m); |
51 | @@ -2298,6 +2299,7 @@ methodHandle SystemDictionary::find_meth | 93 | @@ -2309,6 +2310,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid |
52 | "out of space in CodeCache for method handle intrinsic", empty); | 94 | "out of space in CodeCache for method handle intrinsic", empty); |
53 | } | 95 | } |
54 | } | 96 | } |
@@ -56,7 +98,7 @@ | |||
56 | // Now grab the lock. We might have to throw away the new method, | 98 | // Now grab the lock. We might have to throw away the new method, |
57 | // if a racing thread has managed to install one at the same time. | 99 | // if a racing thread has managed to install one at the same time. |
58 | { | 100 | { |
59 | @@ -2311,9 +2313,11 @@ methodHandle SystemDictionary::find_meth | 101 | @@ -2322,9 +2324,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid |
60 | } | 102 | } |
61 | 103 | ||
62 | assert(spe != NULL && spe->method() != NULL, ""); | 104 | assert(spe != NULL && spe->method() != NULL, ""); |
@@ -68,9 +110,11 @@ | |||
68 | return spe->method(); | 110 | return spe->method(); |
69 | } | 111 | } |
70 | 112 | ||
71 | --- hotspot/src/share/vm/runtime/handles.inline.hpp.orig | 113 | diff --git a/hotspot/src/share/vm/runtime/handles.inline.hpp b/hotspot/src/share/vm/runtime/handles.inline.hpp |
72 | +++ hotspot/src/share/vm/runtime/handles.inline.hpp | 114 | index 761596a50..ca950c154 100644 |
73 | @@ -51,6 +51,12 @@ inline Handle::Handle(Thread* thread, oo | 115 | --- a/hotspot/src/share/vm/runtime/handles.inline.hpp |
116 | +++ b/hotspot/src/share/vm/runtime/handles.inline.hpp | ||
117 | @@ -51,6 +51,12 @@ inline Handle::Handle(Thread* thread, oop obj) { | ||
74 | } | 118 | } |
75 | #endif // ASSERT | 119 | #endif // ASSERT |
76 | 120 | ||
@@ -83,7 +127,7 @@ | |||
83 | // Constructors for metadata handles | 127 | // Constructors for metadata handles |
84 | #define DEF_METADATA_HANDLE_FN(name, type) \ | 128 | #define DEF_METADATA_HANDLE_FN(name, type) \ |
85 | inline name##Handle::name##Handle(type* obj) : _value(obj), _thread(NULL) { \ | 129 | inline name##Handle::name##Handle(type* obj) : _value(obj), _thread(NULL) { \ |
86 | @@ -79,7 +85,7 @@ inline name##Handle::name##Handle(const | 130 | @@ -79,7 +85,7 @@ inline name##Handle::name##Handle(const name##Handle &h) { \ |
87 | } else { \ | 131 | } else { \ |
88 | _thread = Thread::current(); \ | 132 | _thread = Thread::current(); \ |
89 | } \ | 133 | } \ |
@@ -92,18 +136,10 @@ | |||
92 | _thread->metadata_handles()->push((Metadata*)_value); \ | 136 | _thread->metadata_handles()->push((Metadata*)_value); \ |
93 | } else { \ | 137 | } else { \ |
94 | _thread = NULL; \ | 138 | _thread = NULL; \ |
95 | --- hotspot/src/share/vm/shark/sharkEntry.hpp.orig | 139 | diff --git a/hotspot/src/share/vm/shark/llvmHeaders.hpp b/hotspot/src/share/vm/shark/llvmHeaders.hpp |
96 | +++ hotspot/src/share/vm/shark/sharkEntry.hpp | 140 | index 05ef7fea1..4d40ae3dd 100644 |
97 | @@ -27,6 +27,7 @@ | 141 | --- a/hotspot/src/share/vm/shark/llvmHeaders.hpp |
98 | #define SHARE_VM_SHARK_SHARKENTRY_HPP | 142 | +++ b/hotspot/src/share/vm/shark/llvmHeaders.hpp |
99 | |||
100 | #include "shark/llvmHeaders.hpp" | ||
101 | +#include "entry_zero.hpp" | ||
102 | |||
103 | class SharkContext; | ||
104 | |||
105 | --- hotspot/src/share/vm/shark/llvmHeaders.hpp.orig | ||
106 | +++ hotspot/src/share/vm/shark/llvmHeaders.hpp | ||
107 | @@ -35,7 +35,11 @@ | 143 | @@ -35,7 +35,11 @@ |
108 | #undef DEBUG | 144 | #undef DEBUG |
109 | #endif | 145 | #endif |
@@ -116,114 +152,10 @@ | |||
116 | #include <llvm/ExecutionEngine/ExecutionEngine.h> | 152 | #include <llvm/ExecutionEngine/ExecutionEngine.h> |
117 | 153 | ||
118 | // includes specific to each version | 154 | // includes specific to each version |
119 | --- common/autoconf/libraries.m4.orig | 155 | diff --git a/hotspot/src/share/vm/shark/sharkCompiler.cpp b/hotspot/src/share/vm/shark/sharkCompiler.cpp |
120 | +++ common/autoconf/libraries.m4 | 156 | index 86c09932a..462eb98a7 100644 |
121 | @@ -834,8 +834,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIB | 157 | --- a/hotspot/src/share/vm/shark/sharkCompiler.cpp |
122 | fi | 158 | +++ b/hotspot/src/share/vm/shark/sharkCompiler.cpp |
123 | fi | ||
124 | done | ||
125 | - llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//') | ||
126 | + llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//; s/\..*$//') | ||
127 | LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}" | ||
128 | + AS_IF([test $llvm_version -ge 34], [LLVM_CFLAGS="${LLVM_CFLAGS} -std=gnu++11"]) | ||
129 | |||
130 | unset LLVM_LDFLAGS | ||
131 | for flag in $("${LLVM_CONFIG}" --ldflags); do | ||
132 | @@ -848,7 +849,7 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIB | ||
133 | done | ||
134 | |||
135 | unset LLVM_LIBS | ||
136 | - for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do | ||
137 | + for flag in $("${LLVM_CONFIG}" --libs --system-libs ${llvm_components}); do | ||
138 | if echo "${flag}" | grep -q '^-l'; then | ||
139 | if test "${LLVM_LIBS}" != ""; then | ||
140 | LLVM_LIBS="${LLVM_LIBS} " | ||
141 | --- hotspot/src/share/vm/shark/sharkIntrinsics.cpp.orig | ||
142 | +++ hotspot/src/share/vm/shark/sharkIntrinsics.cpp | ||
143 | @@ -265,7 +265,11 @@ void SharkIntrinsics::do_Unsafe_compareA | ||
144 | "addr"); | ||
145 | |||
146 | // Perform the operation | ||
147 | +#if SHARK_LLVM_VERSION <= 34 | ||
148 | Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent); | ||
149 | +#else | ||
150 | + Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); | ||
151 | + #endif | ||
152 | // Push the result | ||
153 | state()->push( | ||
154 | SharkValue::create_jint( | ||
155 | --- hotspot/src/share/vm/shark/sharkRuntime.cpp.orig | ||
156 | +++ hotspot/src/share/vm/shark/sharkRuntime.cpp | ||
157 | @@ -32,6 +32,7 @@ | ||
158 | #ifdef TARGET_ARCH_zero | ||
159 | # include "stack_zero.inline.hpp" | ||
160 | #endif | ||
161 | +#include "memory/oopFactory.hpp" | ||
162 | |||
163 | using namespace llvm; | ||
164 | |||
165 | --- hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp.orig | ||
166 | +++ hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | ||
167 | @@ -1732,7 +1732,11 @@ void SharkTopLevelBlock::do_new() { | ||
168 | heap_object = builder()->CreateIntToPtr( | ||
169 | old_top, SharkType::oop_type(), "heap_object"); | ||
170 | |||
171 | +#if SHARK_LLVM_VERSION <= 34 | ||
172 | Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent); | ||
173 | +#else | ||
174 | + Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); | ||
175 | +#endif | ||
176 | builder()->CreateCondBr( | ||
177 | builder()->CreateICmpEQ(old_top, check), | ||
178 | initialize, retry); | ||
179 | @@ -1933,7 +1937,11 @@ void SharkTopLevelBlock::acquire_lock(Va | ||
180 | |||
181 | Value *lock = builder()->CreatePtrToInt( | ||
182 | monitor_header_addr, SharkType::intptr_type()); | ||
183 | +#if SHARK_LLVM_VERSION <= 34 | ||
184 | Value *check = builder()->CreateAtomicCmpXchg(mark_addr, disp, lock, llvm::Acquire); | ||
185 | +#else | ||
186 | + Value *check = builder()->CreateAtomicCmpXchg(mark_addr, disp, lock, llvm::Acquire, llvm::Acquire); | ||
187 | +#endif | ||
188 | builder()->CreateCondBr( | ||
189 | builder()->CreateICmpEQ(disp, check), | ||
190 | acquired_fast, try_recursive); | ||
191 | @@ -2018,7 +2026,11 @@ void SharkTopLevelBlock::release_lock(in | ||
192 | PointerType::getUnqual(SharkType::intptr_type()), | ||
193 | "mark_addr"); | ||
194 | |||
195 | +#if SHARK_LLVM_VERSION <= 34 | ||
196 | Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release); | ||
197 | +#else | ||
198 | + Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release, llvm::Monotonic); | ||
199 | +#endif | ||
200 | builder()->CreateCondBr( | ||
201 | builder()->CreateICmpEQ(lock, check), | ||
202 | released_fast, slow_path); | ||
203 | --- hotspot/src/cpu/zero/vm/interpreter_zero.cpp.orig | ||
204 | +++ hotspot/src/cpu/zero/vm/interpreter_zero.cpp | ||
205 | @@ -49,7 +49,7 @@ | ||
206 | #ifdef COMPILER1 | ||
207 | #include "c1/c1_Runtime1.hpp" | ||
208 | #endif | ||
209 | -#ifdef CC_INTERP | ||
210 | +#if defined(CC_INTERP) || defined(SHARK) | ||
211 | #include "interpreter/cppInterpreter.hpp" | ||
212 | #endif | ||
213 | |||
214 | --- hotspot/src/share/vm/shark/sharkCompiler.hpp.orig | ||
215 | +++ hotspot/src/share/vm/shark/sharkCompiler.hpp | ||
216 | @@ -40,6 +40,8 @@ class SharkCompiler : public AbstractCom | ||
217 | // Creation | ||
218 | SharkCompiler(); | ||
219 | |||
220 | + void init_llvm(); | ||
221 | + | ||
222 | // Name of this compiler | ||
223 | const char *name() { return "shark"; } | ||
224 | |||
225 | --- hotspot/src/share/vm/shark/sharkCompiler.cpp.orig | ||
226 | +++ hotspot/src/share/vm/shark/sharkCompiler.cpp | ||
227 | @@ -61,11 +61,25 @@ SharkCompiler::SharkCompiler() | 159 | @@ -61,11 +61,25 @@ SharkCompiler::SharkCompiler() |
228 | : AbstractCompiler() { | 160 | : AbstractCompiler() { |
229 | // Create the lock to protect the memory manager and execution engine | 161 | // Create the lock to protect the memory manager and execution engine |
@@ -285,7 +217,7 @@ | |||
285 | } | 217 | } |
286 | 218 | ||
287 | void SharkCompiler::initialize() { | 219 | void SharkCompiler::initialize() { |
288 | @@ -165,7 +183,7 @@ void SharkCompiler::compile_method(ciEnv | 220 | @@ -165,7 +183,7 @@ void SharkCompiler::compile_method(ciEnv* env, |
289 | } | 221 | } |
290 | 222 | ||
291 | // Create the recorders | 223 | // Create the recorders |
@@ -294,7 +226,7 @@ | |||
294 | env->set_oop_recorder(new OopRecorder(&arena)); | 226 | env->set_oop_recorder(new OopRecorder(&arena)); |
295 | OopMapSet oopmaps; | 227 | OopMapSet oopmaps; |
296 | env->set_debug_info(new DebugInformationRecorder(env->oop_recorder())); | 228 | env->set_debug_info(new DebugInformationRecorder(env->oop_recorder())); |
297 | @@ -268,7 +286,12 @@ void SharkCompiler::generate_native_code | 229 | @@ -268,7 +286,12 @@ void SharkCompiler::generate_native_code(SharkEntry* entry, |
298 | 230 | ||
299 | if (SharkVerifyFunction != NULL) { | 231 | if (SharkVerifyFunction != NULL) { |
300 | if (!fnmatch(SharkVerifyFunction, name, 0)) { | 232 | if (!fnmatch(SharkVerifyFunction, name, 0)) { |
@@ -307,7 +239,7 @@ | |||
307 | } | 239 | } |
308 | } | 240 | } |
309 | 241 | ||
310 | @@ -298,7 +321,11 @@ void SharkCompiler::generate_native_code | 242 | @@ -298,7 +321,11 @@ void SharkCompiler::generate_native_code(SharkEntry* entry, |
311 | #endif | 243 | #endif |
312 | #endif // !NDEBUG | 244 | #endif // !NDEBUG |
313 | memory_manager()->set_entry_for_function(function, entry); | 245 | memory_manager()->set_entry_for_function(function, entry); |
@@ -319,8 +251,23 @@ | |||
319 | } | 251 | } |
320 | assert(code != NULL, "code must be != NULL"); | 252 | assert(code != NULL, "code must be != NULL"); |
321 | entry->set_entry_point(code); | 253 | entry->set_entry_point(code); |
322 | --- hotspot/src/share/vm/shark/sharkContext.cpp.orig | 254 | diff --git a/hotspot/src/share/vm/shark/sharkCompiler.hpp b/hotspot/src/share/vm/shark/sharkCompiler.hpp |
323 | +++ hotspot/src/share/vm/shark/sharkContext.cpp | 255 | index 974002988..36b5b2427 100644 |
256 | --- a/hotspot/src/share/vm/shark/sharkCompiler.hpp | ||
257 | +++ b/hotspot/src/share/vm/shark/sharkCompiler.hpp | ||
258 | @@ -40,6 +40,8 @@ class SharkCompiler : public AbstractCompiler { | ||
259 | // Creation | ||
260 | SharkCompiler(); | ||
261 | |||
262 | + void init_llvm(); | ||
263 | + | ||
264 | // Name of this compiler | ||
265 | const char *name() { return "shark"; } | ||
266 | |||
267 | diff --git a/hotspot/src/share/vm/shark/sharkContext.cpp b/hotspot/src/share/vm/shark/sharkContext.cpp | ||
268 | index 0fc86f0b1..e16318ccf 100644 | ||
269 | --- a/hotspot/src/share/vm/shark/sharkContext.cpp | ||
270 | +++ b/hotspot/src/share/vm/shark/sharkContext.cpp | ||
324 | @@ -34,8 +34,13 @@ | 271 | @@ -34,8 +34,13 @@ |
325 | using namespace llvm; | 272 | using namespace llvm; |
326 | 273 | ||
@@ -337,8 +284,10 @@ | |||
337 | // Create a module to build our functions into | 284 | // Create a module to build our functions into |
338 | _module = new Module(name, *this); | 285 | _module = new Module(name, *this); |
339 | 286 | ||
340 | --- hotspot/src/share/vm/shark/sharkContext.hpp.orig | 287 | diff --git a/hotspot/src/share/vm/shark/sharkContext.hpp b/hotspot/src/share/vm/shark/sharkContext.hpp |
341 | +++ hotspot/src/share/vm/shark/sharkContext.hpp | 288 | index 952cf13b7..85b48e99a 100644 |
289 | --- a/hotspot/src/share/vm/shark/sharkContext.hpp | ||
290 | +++ b/hotspot/src/share/vm/shark/sharkContext.hpp | ||
342 | @@ -29,6 +29,8 @@ | 291 | @@ -29,6 +29,8 @@ |
343 | #include "shark/llvmHeaders.hpp" | 292 | #include "shark/llvmHeaders.hpp" |
344 | #include "shark/sharkCompiler.hpp" | 293 | #include "shark/sharkCompiler.hpp" |
@@ -348,7 +297,7 @@ | |||
348 | // The LLVMContext class allows multiple instances of LLVM to operate | 297 | // The LLVMContext class allows multiple instances of LLVM to operate |
349 | // independently of each other in a multithreaded context. We extend | 298 | // independently of each other in a multithreaded context. We extend |
350 | // this here to store things in Shark that are LLVMContext-specific. | 299 | // this here to store things in Shark that are LLVMContext-specific. |
351 | @@ -41,12 +43,28 @@ class SharkContext : public llvm::LLVMCo | 300 | @@ -41,12 +43,28 @@ class SharkContext : public llvm::LLVMContext { |
352 | 301 | ||
353 | private: | 302 | private: |
354 | llvm::Module* _module; | 303 | llvm::Module* _module; |
@@ -377,7 +326,7 @@ | |||
377 | // Get this thread's SharkContext | 326 | // Get this thread's SharkContext |
378 | public: | 327 | public: |
379 | static SharkContext& current() { | 328 | static SharkContext& current() { |
380 | @@ -55,12 +73,35 @@ class SharkContext : public llvm::LLVMCo | 329 | @@ -55,12 +73,35 @@ class SharkContext : public llvm::LLVMContext { |
381 | 330 | ||
382 | // Module accessors | 331 | // Module accessors |
383 | public: | 332 | public: |
@@ -414,3 +363,86 @@ | |||
414 | } | 363 | } |
415 | 364 | ||
416 | // Basic types | 365 | // Basic types |
366 | diff --git a/hotspot/src/share/vm/shark/sharkEntry.hpp b/hotspot/src/share/vm/shark/sharkEntry.hpp | ||
367 | index e0f535c69..c079e255a 100644 | ||
368 | --- a/hotspot/src/share/vm/shark/sharkEntry.hpp | ||
369 | +++ b/hotspot/src/share/vm/shark/sharkEntry.hpp | ||
370 | @@ -27,6 +27,7 @@ | ||
371 | #define SHARE_VM_SHARK_SHARKENTRY_HPP | ||
372 | |||
373 | #include "shark/llvmHeaders.hpp" | ||
374 | +#include "entry_zero.hpp" | ||
375 | |||
376 | class SharkContext; | ||
377 | |||
378 | diff --git a/hotspot/src/share/vm/shark/sharkIntrinsics.cpp b/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | ||
379 | index 9ad91c96d..560bb83f4 100644 | ||
380 | --- a/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | ||
381 | +++ b/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | ||
382 | @@ -265,7 +265,11 @@ void SharkIntrinsics::do_Unsafe_compareAndSwapInt() { | ||
383 | "addr"); | ||
384 | |||
385 | // Perform the operation | ||
386 | +#if SHARK_LLVM_VERSION <= 34 | ||
387 | Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent); | ||
388 | +#else | ||
389 | + Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); | ||
390 | + #endif | ||
391 | // Push the result | ||
392 | state()->push( | ||
393 | SharkValue::create_jint( | ||
394 | diff --git a/hotspot/src/share/vm/shark/sharkRuntime.cpp b/hotspot/src/share/vm/shark/sharkRuntime.cpp | ||
395 | index fd9916e11..1ae03753e 100644 | ||
396 | --- a/hotspot/src/share/vm/shark/sharkRuntime.cpp | ||
397 | +++ b/hotspot/src/share/vm/shark/sharkRuntime.cpp | ||
398 | @@ -32,6 +32,7 @@ | ||
399 | #ifdef TARGET_ARCH_zero | ||
400 | # include "stack_zero.inline.hpp" | ||
401 | #endif | ||
402 | +#include "memory/oopFactory.hpp" | ||
403 | |||
404 | using namespace llvm; | ||
405 | |||
406 | diff --git a/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp b/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | ||
407 | index 243183c07..601ca7925 100644 | ||
408 | --- a/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | ||
409 | +++ b/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | ||
410 | @@ -1732,7 +1732,11 @@ void SharkTopLevelBlock::do_new() { | ||
411 | heap_object = builder()->CreateIntToPtr( | ||
412 | old_top, SharkType::oop_type(), "heap_object"); | ||
413 | |||
414 | +#if SHARK_LLVM_VERSION <= 34 | ||
415 | Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent); | ||
416 | +#else | ||
417 | + Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); | ||
418 | +#endif | ||
419 | builder()->CreateCondBr( | ||
420 | builder()->CreateICmpEQ(old_top, check), | ||
421 | initialize, retry); | ||
422 | @@ -1933,7 +1937,11 @@ void SharkTopLevelBlock::acquire_lock(Value *lockee, int exception_action) { | ||
423 | |||
424 | Value *lock = builder()->CreatePtrToInt( | ||
425 | monitor_header_addr, SharkType::intptr_type()); | ||
426 | +#if SHARK_LLVM_VERSION <= 34 | ||
427 | Value *check = builder()->CreateAtomicCmpXchg(mark_addr, disp, lock, llvm::Acquire); | ||
428 | +#else | ||
429 | + Value *check = builder()->CreateAtomicCmpXchg(mark_addr, disp, lock, llvm::Acquire, llvm::Acquire); | ||
430 | +#endif | ||
431 | builder()->CreateCondBr( | ||
432 | builder()->CreateICmpEQ(disp, check), | ||
433 | acquired_fast, try_recursive); | ||
434 | @@ -2018,7 +2026,11 @@ void SharkTopLevelBlock::release_lock(int exception_action) { | ||
435 | PointerType::getUnqual(SharkType::intptr_type()), | ||
436 | "mark_addr"); | ||
437 | |||
438 | +#if SHARK_LLVM_VERSION <= 34 | ||
439 | Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release); | ||
440 | +#else | ||
441 | + Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release, llvm::Monotonic); | ||
442 | +#endif | ||
443 | builder()->CreateCondBr( | ||
444 | builder()->CreateICmpEQ(lock, check), | ||
445 | released_fast, slow_path); | ||
446 | -- | ||
447 | 2.24.1 | ||
448 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch new file mode 100644 index 0000000..b61f664 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From e4c080e29afa3f93383c1e046273cd20ec835ca3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Rehsack <rehsack@gmail.com> | ||
3 | Date: Thu, 2 Jan 2020 10:23:38 +0100 | ||
4 | Subject: [PATCH 1012/1012] hotspot: restrict to staging dir | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | make/linux/makefiles/dtrace.make | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/hotspot/make/linux/makefiles/dtrace.make b/hotspot/make/linux/makefiles/dtrace.make | ||
12 | index 386e94b1f..7642a67f8 100644 | ||
13 | --- a/hotspot/make/linux/makefiles/dtrace.make | ||
14 | +++ b/hotspot/make/linux/makefiles/dtrace.make | ||
15 | @@ -40,7 +40,7 @@ else | ||
16 | ifneq ($(ALT_SDT_H),) | ||
17 | SDT_H_FILE = $(ALT_SDT_H) | ||
18 | else | ||
19 | - SDT_H_FILE = /usr/include/sys/sdt.h | ||
20 | + SDT_H_FILE = $(SYS_ROOT)/usr/include/sys/sdt.h | ||
21 | endif | ||
22 | DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) | ||
23 | REASON = "$(SDT_H_FILE) not found" | ||
24 | -- | ||
25 | 2.24.1 | ||
26 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch index b310598..38d3019 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 97d6911fb581f9e44785db29abbf97ce77713f50 Mon Sep 17 00:00:00 2001 | 1 | From 46ea1c28b53bf5fd2be03fa1d78936f6a1e70fc4 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 11:13:08 +0000 | 3 | Date: Fri, 2 Mar 2018 11:13:08 +0000 |
4 | Subject: [PATCH 1/9] jdk: comparison between pointer and integer | 4 | Subject: [PATCH 2001/2008] jdk: comparison between pointer and integer |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -18,15 +18,17 @@ jdk/src/share/native/java/net/net_util.c:225:13: note: in expansion of macro 'CH | |||
18 | Backport a patch to fix this. | 18 | Backport a patch to fix this. |
19 | 19 | ||
20 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/90c643593ed7] | 20 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/90c643593ed7] |
21 | |||
21 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 22 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
22 | --- | 24 | --- |
23 | jdk/src/share/native/java/net/net_util.c | 15 +++++++-------- | 25 | src/share/native/java/net/net_util.c | 15 +++++++-------- |
24 | jdk/src/share/native/java/net/net_util.h | 8 ++++---- | 26 | src/share/native/java/net/net_util.h | 8 ++++---- |
25 | jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 4 ++-- | 27 | src/solaris/native/java/net/Inet6AddressImpl.c | 4 ++-- |
26 | 3 files changed, 13 insertions(+), 14 deletions(-) | 28 | 3 files changed, 13 insertions(+), 14 deletions(-) |
27 | 29 | ||
28 | diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c | 30 | diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c |
29 | index 2194e2e6..00c9e2ac 100644 | 31 | index b1b8223a6..2eee6261a 100644 |
30 | --- a/jdk/src/share/native/java/net/net_util.c | 32 | --- a/jdk/src/share/native/java/net/net_util.c |
31 | +++ b/jdk/src/share/native/java/net/net_util.c | 33 | +++ b/jdk/src/share/native/java/net/net_util.c |
32 | @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { | 34 | @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { |
@@ -65,7 +67,7 @@ index 2194e2e6..00c9e2ac 100644 | |||
65 | jobject holder; | 67 | jobject holder; |
66 | jbyteArray addr; | 68 | jbyteArray addr; |
67 | 69 | ||
68 | @@ -202,7 +202,6 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { | 70 | @@ -208,7 +208,6 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { |
69 | jobject iaObj; | 71 | jobject iaObj; |
70 | #ifdef AF_INET6 | 72 | #ifdef AF_INET6 |
71 | if (him->sa_family == AF_INET6) { | 73 | if (him->sa_family == AF_INET6) { |
@@ -73,8 +75,8 @@ index 2194e2e6..00c9e2ac 100644 | |||
73 | #ifdef WIN32 | 75 | #ifdef WIN32 |
74 | struct SOCKADDR_IN6 *him6 = (struct SOCKADDR_IN6 *)him; | 76 | struct SOCKADDR_IN6 *him6 = (struct SOCKADDR_IN6 *)him; |
75 | #else | 77 | #else |
76 | @@ -218,11 +217,12 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { | 78 | @@ -226,11 +225,12 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { |
77 | setInetAddress_family(env, iaObj, IPv4); | 79 | JNU_CHECK_EXCEPTION_RETURN(env, NULL); |
78 | } else { | 80 | } else { |
79 | jint scope; | 81 | jint scope; |
80 | - int ret; | 82 | - int ret; |
@@ -86,9 +88,9 @@ index 2194e2e6..00c9e2ac 100644 | |||
86 | + if (ret == JNI_FALSE) | 88 | + if (ret == JNI_FALSE) |
87 | + return NULL; | 89 | + return NULL; |
88 | setInetAddress_family(env, iaObj, IPv6); | 90 | setInetAddress_family(env, iaObj, IPv6); |
91 | JNU_CHECK_EXCEPTION_RETURN(env, NULL); | ||
89 | scope = getScopeID(him); | 92 | scope = getScopeID(him); |
90 | setInet6Address_scopeid(env, iaObj, scope); | 93 | @@ -282,7 +282,6 @@ NET_SockaddrEqualsInetAddress(JNIEnv *env, struct sockaddr *him, jobject iaObj) |
91 | @@ -269,7 +269,6 @@ NET_SockaddrEqualsInetAddress(JNIEnv *env, struct sockaddr *him, jobject iaObj) | ||
92 | return JNI_FALSE; | 94 | return JNI_FALSE; |
93 | } | 95 | } |
94 | } else { | 96 | } else { |
@@ -97,7 +99,7 @@ index 2194e2e6..00c9e2ac 100644 | |||
97 | int scope; | 99 | int scope; |
98 | 100 | ||
99 | diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h | 101 | diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h |
100 | index c8a5e68c..176ca586 100644 | 102 | index c8a5e68c4..176ca586e 100644 |
101 | --- a/jdk/src/share/native/java/net/net_util.h | 103 | --- a/jdk/src/share/native/java/net/net_util.h |
102 | +++ b/jdk/src/share/native/java/net/net_util.h | 104 | +++ b/jdk/src/share/native/java/net/net_util.h |
103 | @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); | 105 | @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); |
@@ -118,10 +120,10 @@ index c8a5e68c..176ca586 100644 | |||
118 | extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); | 120 | extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); |
119 | extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); | 121 | extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); |
120 | diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 122 | diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
121 | index e29a25da..23ec2985 100644 | 123 | index 0a51a365f..dcc348cf1 100644 |
122 | --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 124 | --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
123 | +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 125 | +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
124 | @@ -403,7 +403,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, | 126 | @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, |
125 | } | 127 | } |
126 | 128 | ||
127 | while (iterator != NULL) { | 129 | while (iterator != NULL) { |
@@ -130,7 +132,7 @@ index e29a25da..23ec2985 100644 | |||
130 | if (iterator->ai_family == AF_INET) { | 132 | if (iterator->ai_family == AF_INET) { |
131 | jobject iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID); | 133 | jobject iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID); |
132 | if (IS_NULL(iaObj)) { | 134 | if (IS_NULL(iaObj)) { |
133 | @@ -423,7 +423,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, | 135 | @@ -416,7 +416,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, |
134 | goto cleanupAndReturn; | 136 | goto cleanupAndReturn; |
135 | } | 137 | } |
136 | ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr)); | 138 | ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr)); |
@@ -140,5 +142,5 @@ index e29a25da..23ec2985 100644 | |||
140 | goto cleanupAndReturn; | 142 | goto cleanupAndReturn; |
141 | } | 143 | } |
142 | -- | 144 | -- |
143 | 2.16.2 | 145 | 2.24.1 |
144 | 146 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0003-jdk-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch index e189278..4d1df8a 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0003-jdk-Allow-using-a-system-installed-libjpeg.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a6746c1ee43a63e79b5405e40c463d00160bc02e Mon Sep 17 00:00:00 2001 | 1 | From aef9a3f955f6e189b2a24b9f79ccb396275d4fa3 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 13:36:53 +0000 | 3 | Date: Tue, 27 Feb 2018 13:36:53 +0000 |
4 | Subject: [PATCH 3/9] jdk: Allow using a system-installed libjpeg | 4 | Subject: [PATCH 2002/2008] jdk: Allow using a system-installed libjpeg |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -20,66 +20,20 @@ Issues fixed on top of debian patch: | |||
20 | 20 | ||
21 | Upstream-Status: Backport | 21 | Upstream-Status: Backport |
22 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 22 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
23 | --- | 24 | --- |
24 | common/autoconf/libraries.m4 | 35 +++++++++-- | 25 | make/lib/Awt2dLibraries.gmk | 69 +++++++++++++------ |
25 | jdk/make/lib/Awt2dLibraries.gmk | 69 +++++++++++++++------- | 26 | .../imageio/plugins/jpeg/JPEGImageReader.java | 2 +- |
26 | .../sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +- | 27 | .../imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- |
27 | .../sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- | 28 | .../sun/awt/image/JPEGImageDecoder.java | 2 +- |
28 | .../classes/sun/awt/image/JPEGImageDecoder.java | 2 +- | 29 | .../native/sun/awt/image/jpeg/imageioJPEG.c | 2 +- |
29 | .../share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +- | 30 | 5 files changed, 51 insertions(+), 26 deletions(-) |
30 | 6 files changed, 81 insertions(+), 31 deletions(-) | ||
31 | 31 | ||
32 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | ||
33 | index 91b8ed7f..3f5f69b1 100644 | ||
34 | --- a/common/autoconf/libraries.m4 | ||
35 | +++ b/common/autoconf/libraries.m4 | ||
36 | @@ -595,11 +595,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | ||
37 | # Check for the jpeg library | ||
38 | # | ||
39 | |||
40 | - USE_EXTERNAL_LIBJPEG=true | ||
41 | - AC_CHECK_LIB(jpeg, main, [], | ||
42 | - [ USE_EXTERNAL_LIBJPEG=false | ||
43 | - AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source]) | ||
44 | - ]) | ||
45 | + AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg], | ||
46 | + [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) | ||
47 | + | ||
48 | + AC_MSG_CHECKING([for which libjpeg to use]) | ||
49 | + | ||
50 | + # default is bundled | ||
51 | + DEFAULT_LIBJPEG=bundled | ||
52 | + | ||
53 | + # | ||
54 | + # if user didn't specify, use DEFAULT_LIBJPEG | ||
55 | + # | ||
56 | + if test "x${with_libjpeg}" = "x"; then | ||
57 | + with_libjpeg=${DEFAULT_LIBJPEG} | ||
58 | + fi | ||
59 | + | ||
60 | + AC_MSG_RESULT(${with_libjpeg}) | ||
61 | + | ||
62 | + if test "x${with_libjpeg}" = "xbundled"; then | ||
63 | + USE_EXTERNAL_LIBJPEG=false | ||
64 | + elif test "x${with_libjpeg}" = "xsystem"; then | ||
65 | + AC_CHECK_HEADER(jpeglib.h, [], | ||
66 | + [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])]) | ||
67 | + AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [], | ||
68 | + [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])]) | ||
69 | + | ||
70 | + USE_EXTERNAL_LIBJPEG=true | ||
71 | + else | ||
72 | + AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled']) | ||
73 | + fi | ||
74 | + | ||
75 | AC_SUBST(USE_EXTERNAL_LIBJPEG) | ||
76 | |||
77 | ############################################################################### | ||
78 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | 32 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk |
79 | index aa7efc4a..8872a8e8 100644 | 33 | index a06bfd6db..12b9da11d 100644 |
80 | --- a/jdk/make/lib/Awt2dLibraries.gmk | 34 | --- a/jdk/make/lib/Awt2dLibraries.gmk |
81 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | 35 | +++ b/jdk/make/lib/Awt2dLibraries.gmk |
82 | @@ -707,21 +707,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) | 36 | @@ -695,21 +695,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) |
83 | 37 | ||
84 | ########################################################################################## | 38 | ########################################################################################## |
85 | 39 | ||
@@ -110,7 +64,7 @@ index aa7efc4a..8872a8e8 100644 | |||
110 | # Suppress gcc warnings like "variable might be clobbered by 'longjmp' | 64 | # Suppress gcc warnings like "variable might be clobbered by 'longjmp' |
111 | # or 'vfork'": this warning indicates that some variable is placed to | 65 | # or 'vfork'": this warning indicates that some variable is placed to |
112 | # a register by optimized compiler and it's value might be lost on longjmp(). | 66 | # a register by optimized compiler and it's value might be lost on longjmp(). |
113 | @@ -733,37 +736,50 @@ endif | 67 | @@ -721,37 +724,50 @@ endif |
114 | # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ | 68 | # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ |
115 | # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) | 69 | # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) |
116 | # ifeq ($(CC_43_OR_NEWER), 1) | 70 | # ifeq ($(CC_43_OR_NEWER), 1) |
@@ -175,7 +129,7 @@ index aa7efc4a..8872a8e8 100644 | |||
175 | 129 | ||
176 | ########################################################################################## | 130 | ########################################################################################## |
177 | 131 | ||
178 | @@ -1213,6 +1229,13 @@ ifndef BUILD_HEADLESS_ONLY | 132 | @@ -1142,6 +1158,13 @@ ifndef BUILD_HEADLESS_ONLY |
179 | GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib | 133 | GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib |
180 | endif | 134 | endif |
181 | 135 | ||
@@ -189,7 +143,7 @@ index aa7efc4a..8872a8e8 100644 | |||
189 | ifneq ($(OPENJDK_TARGET_OS), macosx) | 143 | ifneq ($(OPENJDK_TARGET_OS), macosx) |
190 | LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen | 144 | LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen |
191 | else | 145 | else |
192 | @@ -1273,11 +1296,13 @@ ifndef BUILD_HEADLESS_ONLY | 146 | @@ -1198,11 +1221,13 @@ ifndef BUILD_HEADLESS_ONLY |
193 | EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ | 147 | EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ |
194 | LANG := C, \ | 148 | LANG := C, \ |
195 | OPTIMIZATION := LOW, \ | 149 | OPTIMIZATION := LOW, \ |
@@ -206,7 +160,7 @@ index aa7efc4a..8872a8e8 100644 | |||
206 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | 160 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
207 | RC_FLAGS := $(RC_FLAGS) \ | 161 | RC_FLAGS := $(RC_FLAGS) \ |
208 | diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 162 | diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java |
209 | index 5c93d89e..5efc00a7 100644 | 163 | index 8f58f5b3e..fcbab8260 100644 |
210 | --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 164 | --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java |
211 | +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 165 | +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java |
212 | @@ -89,7 +89,7 @@ public class JPEGImageReader extends ImageReader { | 166 | @@ -89,7 +89,7 @@ public class JPEGImageReader extends ImageReader { |
@@ -219,7 +173,7 @@ index 5c93d89e..5efc00a7 100644 | |||
219 | } | 173 | } |
220 | }); | 174 | }); |
221 | diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 175 | diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java |
222 | index 6a33bd5a..dca189ed 100644 | 176 | index 6a33bd5a1..dca189ed8 100644 |
223 | --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 177 | --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java |
224 | +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 178 | +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java |
225 | @@ -177,7 +177,7 @@ public class JPEGImageWriter extends ImageWriter { | 179 | @@ -177,7 +177,7 @@ public class JPEGImageWriter extends ImageWriter { |
@@ -232,7 +186,7 @@ index 6a33bd5a..dca189ed 100644 | |||
232 | } | 186 | } |
233 | }); | 187 | }); |
234 | diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java | 188 | diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java |
235 | index 872ffc01..5965a186 100644 | 189 | index 872ffc019..5965a186b 100644 |
236 | --- a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java | 190 | --- a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java |
237 | +++ b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java | 191 | +++ b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java |
238 | @@ -56,7 +56,7 @@ public class JPEGImageDecoder extends ImageDecoder { | 192 | @@ -56,7 +56,7 @@ public class JPEGImageDecoder extends ImageDecoder { |
@@ -245,7 +199,7 @@ index 872ffc01..5965a186 100644 | |||
245 | } | 199 | } |
246 | }); | 200 | }); |
247 | diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 201 | diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c |
248 | index 7e1d8c99..8cac61da 100644 | 202 | index 7e1d8c99d..8cac61da3 100644 |
249 | --- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 203 | --- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c |
250 | +++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 204 | +++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c |
251 | @@ -51,7 +51,7 @@ | 205 | @@ -51,7 +51,7 @@ |
@@ -258,5 +212,5 @@ index 7e1d8c99..8cac61da 100644 | |||
258 | #undef MAX | 212 | #undef MAX |
259 | #define MAX(a,b) ((a) > (b) ? (a) : (b)) | 213 | #define MAX(a,b) ((a) > (b) ? (a) : (b)) |
260 | -- | 214 | -- |
261 | 2.16.2 | 215 | 2.24.1 |
262 | 216 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch new file mode 100644 index 0000000..13d3045 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | From bdf8cb302ab7c8f11b676f93da482cd4a9405ce4 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Tue, 27 Feb 2018 13:43:04 +0000 | ||
4 | Subject: [PATCH 2003/2008] jdk: Allow using a system-installed libpng | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Patch stolen (and some typos corrected) from debian patch, | ||
10 | which itself was a backport from: | ||
11 | http://hg.openjdk.java.net/jdk9/jdk9/rev/bfc1c131e540 | ||
12 | http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5e503831b142 | ||
13 | |||
14 | Issues fixed on top of debian patch: | ||
15 | * the default when --with-libpng= is not given works | ||
16 | * using the bundled libpng works | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
20 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
21 | --- | ||
22 | make/lib/Awt2dLibraries.gmk | 12 +++++++++--- | ||
23 | .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- | ||
24 | 2 files changed, 10 insertions(+), 5 deletions(-) | ||
25 | |||
26 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | ||
27 | index 12b9da11d..cd8b94cd8 100644 | ||
28 | --- a/jdk/make/lib/Awt2dLibraries.gmk | ||
29 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | ||
30 | @@ -1148,7 +1148,6 @@ endif | ||
31 | ifndef BUILD_HEADLESS_ONLY | ||
32 | LIBSPLASHSCREEN_DIRS := \ | ||
33 | $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ | ||
34 | - $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \ | ||
35 | $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen | ||
36 | |||
37 | ifeq ($(USE_EXTERNAL_LIBGIF), true) | ||
38 | @@ -1165,6 +1164,13 @@ ifndef BUILD_HEADLESS_ONLY | ||
39 | LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg | ||
40 | endif | ||
41 | |||
42 | + ifeq ($(USE_EXTERNAL_LIBPNG), true) | ||
43 | + LIBPNG_LDFLAGS := -lpng | ||
44 | + else | ||
45 | + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng | ||
46 | + LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng | ||
47 | + endif | ||
48 | + | ||
49 | ifneq ($(OPENJDK_TARGET_OS), macosx) | ||
50 | LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen | ||
51 | else | ||
52 | @@ -1222,12 +1228,12 @@ ifndef BUILD_HEADLESS_ONLY | ||
53 | LANG := C, \ | ||
54 | OPTIMIZATION := LOW, \ | ||
55 | CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ | ||
56 | - $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \ | ||
57 | + $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \ | ||
58 | MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ | ||
59 | LDFLAGS := $(LDFLAGS_JDKLIB) \ | ||
60 | $(call SET_SHARED_LIBRARY_ORIGIN), \ | ||
61 | LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ | ||
62 | - $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \ | ||
63 | + $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \ | ||
64 | LDFLAGS_SUFFIX_solaris := -lc, \ | ||
65 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | ||
66 | RC_FLAGS := $(RC_FLAGS) \ | ||
67 | diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
68 | index 3599433e4..5bf002ea1 100644 | ||
69 | --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
70 | +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
71 | @@ -25,8 +25,7 @@ | ||
72 | |||
73 | #include "splashscreen_impl.h" | ||
74 | |||
75 | -#include "../libpng/png.h" | ||
76 | - | ||
77 | +#include <png.h> | ||
78 | #include <setjmp.h> | ||
79 | |||
80 | #define SIG_BYTES 8 | ||
81 | -- | ||
82 | 2.24.1 | ||
83 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0007-jdk-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch index 2efdbf5..365b4d6 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0007-jdk-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From df9c5738c4a8a00ba65948503ff0c0cfa2f17e95 Mon Sep 17 00:00:00 2001 | 1 | From 48d7384387394820f2f5e8bdc2982c242568b548 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 | 3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 |
4 | Subject: [PATCH 7/9] jdk: use correct include for poll | 4 | Subject: [PATCH 2004/2008] jdk: use correct include for poll |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -24,21 +24,22 @@ the following command: | |||
24 | 24 | ||
25 | Upstream-Status: Pending | 25 | Upstream-Status: Pending |
26 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 26 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
27 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
27 | --- | 28 | --- |
28 | jdk/src/aix/native/java/net/aix_close.c | 2 +- | 29 | src/aix/native/java/net/aix_close.c | 2 +- |
29 | jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- | 30 | src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- |
30 | jdk/src/solaris/native/java/net/PlainSocketImpl.c | 2 +- | 31 | src/solaris/native/java/net/PlainSocketImpl.c | 2 +- |
31 | jdk/src/solaris/native/java/net/bsd_close.c | 2 +- | 32 | src/solaris/native/java/net/bsd_close.c | 2 +- |
32 | jdk/src/solaris/native/java/net/linux_close.c | 2 +- | 33 | src/solaris/native/java/net/linux_close.c | 2 +- |
33 | jdk/src/solaris/native/java/net/net_util_md.h | 2 +- | 34 | src/solaris/native/java/net/net_util_md.h | 2 +- |
34 | jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 2 +- | 35 | src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 2 +- |
35 | jdk/src/solaris/native/sun/nio/ch/Net.c | 2 +- | 36 | src/solaris/native/sun/nio/ch/Net.c | 2 +- |
36 | jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 2 +- | 37 | src/solaris/native/sun/nio/fs/LinuxWatchService.c | 2 +- |
37 | jdk/src/solaris/transport/socket/socket_md.c | 2 +- | 38 | src/solaris/transport/socket/socket_md.c | 2 +- |
38 | 10 files changed, 10 insertions(+), 10 deletions(-) | 39 | 10 files changed, 10 insertions(+), 10 deletions(-) |
39 | 40 | ||
40 | diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c | 41 | diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c |
41 | index 8c070e4b..126f4d7d 100644 | 42 | index 8c070e4b7..126f4d7d4 100644 |
42 | --- a/jdk/src/aix/native/java/net/aix_close.c | 43 | --- a/jdk/src/aix/native/java/net/aix_close.c |
43 | +++ b/jdk/src/aix/native/java/net/aix_close.c | 44 | +++ b/jdk/src/aix/native/java/net/aix_close.c |
44 | @@ -51,7 +51,7 @@ | 45 | @@ -51,7 +51,7 @@ |
@@ -51,7 +52,7 @@ index 8c070e4b..126f4d7d 100644 | |||
51 | /* | 52 | /* |
52 | * Stack allocated by thread when doing blocking operation | 53 | * Stack allocated by thread when doing blocking operation |
53 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 54 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
54 | index 70064b89..c10c602b 100644 | 55 | index 70064b890..c10c602b6 100644 |
55 | --- a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 56 | --- a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
56 | +++ b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 57 | +++ b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
57 | @@ -34,7 +34,7 @@ | 58 | @@ -34,7 +34,7 @@ |
@@ -64,7 +65,7 @@ index 70064b89..c10c602b 100644 | |||
64 | #include <fcntl.h> | 65 | #include <fcntl.h> |
65 | #include <stddef.h> | 66 | #include <stddef.h> |
66 | diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 67 | diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
67 | index 71cbdf8c..170957e7 100644 | 68 | index 71cbdf8ce..170957e73 100644 |
68 | --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 69 | --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
69 | +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 70 | +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
70 | @@ -28,7 +28,7 @@ | 71 | @@ -28,7 +28,7 @@ |
@@ -77,7 +78,7 @@ index 71cbdf8c..170957e7 100644 | |||
77 | #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ | 78 | #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ |
78 | #include <netinet/in.h> | 79 | #include <netinet/in.h> |
79 | diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c | 80 | diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c |
80 | index af57cef3..64d04088 100644 | 81 | index af57cef30..64d040887 100644 |
81 | --- a/jdk/src/solaris/native/java/net/bsd_close.c | 82 | --- a/jdk/src/solaris/native/java/net/bsd_close.c |
82 | +++ b/jdk/src/solaris/native/java/net/bsd_close.c | 83 | +++ b/jdk/src/solaris/native/java/net/bsd_close.c |
83 | @@ -36,7 +36,7 @@ | 84 | @@ -36,7 +36,7 @@ |
@@ -90,7 +91,7 @@ index af57cef3..64d04088 100644 | |||
90 | /* | 91 | /* |
91 | * Stack allocated by thread when doing blocking operation | 92 | * Stack allocated by thread when doing blocking operation |
92 | diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c | 93 | diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c |
93 | index 98e1ce09..85fba135 100644 | 94 | index 98e1ce098..85fba135f 100644 |
94 | --- a/jdk/src/solaris/native/java/net/linux_close.c | 95 | --- a/jdk/src/solaris/native/java/net/linux_close.c |
95 | +++ b/jdk/src/solaris/native/java/net/linux_close.c | 96 | +++ b/jdk/src/solaris/native/java/net/linux_close.c |
96 | @@ -34,7 +34,7 @@ | 97 | @@ -34,7 +34,7 @@ |
@@ -103,7 +104,7 @@ index 98e1ce09..85fba135 100644 | |||
103 | /* | 104 | /* |
104 | * Stack allocated by thread when doing blocking operation | 105 | * Stack allocated by thread when doing blocking operation |
105 | diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h | 106 | diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h |
106 | index a48446de..8915b68a 100644 | 107 | index a48446de9..8915b68aa 100644 |
107 | --- a/jdk/src/solaris/native/java/net/net_util_md.h | 108 | --- a/jdk/src/solaris/native/java/net/net_util_md.h |
108 | +++ b/jdk/src/solaris/native/java/net/net_util_md.h | 109 | +++ b/jdk/src/solaris/native/java/net/net_util_md.h |
109 | @@ -33,7 +33,7 @@ | 110 | @@ -33,7 +33,7 @@ |
@@ -116,7 +117,7 @@ index a48446de..8915b68a 100644 | |||
116 | 117 | ||
117 | 118 | ||
118 | diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 119 | diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
119 | index 6860a167..20849dab 100644 | 120 | index 6860a167b..20849dabc 100644 |
120 | --- a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 121 | --- a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
121 | +++ b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 122 | +++ b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
122 | @@ -28,7 +28,7 @@ | 123 | @@ -28,7 +28,7 @@ |
@@ -129,7 +130,7 @@ index 6860a167..20849dab 100644 | |||
129 | #include <sys/time.h> | 130 | #include <sys/time.h> |
130 | 131 | ||
131 | diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c | 132 | diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c |
132 | index 73560ad6..a3720055 100644 | 133 | index 73560ad6c..a3720055c 100644 |
133 | --- a/jdk/src/solaris/native/sun/nio/ch/Net.c | 134 | --- a/jdk/src/solaris/native/sun/nio/ch/Net.c |
134 | +++ b/jdk/src/solaris/native/sun/nio/ch/Net.c | 135 | +++ b/jdk/src/solaris/native/sun/nio/ch/Net.c |
135 | @@ -23,7 +23,7 @@ | 136 | @@ -23,7 +23,7 @@ |
@@ -142,7 +143,7 @@ index 73560ad6..a3720055 100644 | |||
142 | #include <sys/socket.h> | 143 | #include <sys/socket.h> |
143 | #include <string.h> | 144 | #include <string.h> |
144 | diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 145 | diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
145 | index 375aaa48..7606e9ba 100644 | 146 | index 375aaa485..7606e9ba8 100644 |
146 | --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 147 | --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
147 | +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 148 | +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
148 | @@ -32,7 +32,7 @@ | 149 | @@ -32,7 +32,7 @@ |
@@ -155,7 +156,7 @@ index 375aaa48..7606e9ba 100644 | |||
155 | 156 | ||
156 | #include "sun_nio_fs_LinuxWatchService.h" | 157 | #include "sun_nio_fs_LinuxWatchService.h" |
157 | diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c | 158 | diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c |
158 | index 33e062e0..819fcabd 100644 | 159 | index 33e062e08..819fcabdb 100644 |
159 | --- a/jdk/src/solaris/transport/socket/socket_md.c | 160 | --- a/jdk/src/solaris/transport/socket/socket_md.c |
160 | +++ b/jdk/src/solaris/transport/socket/socket_md.c | 161 | +++ b/jdk/src/solaris/transport/socket/socket_md.c |
161 | @@ -37,7 +37,7 @@ | 162 | @@ -37,7 +37,7 @@ |
@@ -168,5 +169,5 @@ index 33e062e0..819fcabd 100644 | |||
168 | 169 | ||
169 | #include "socket_md.h" | 170 | #include "socket_md.h" |
170 | -- | 171 | -- |
171 | 2.16.2 | 172 | 2.24.1 |
172 | 173 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch index 05f9558..32bde99 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a063ee68bc0dd7dbf9737df4ee191e98796f2f6a Mon Sep 17 00:00:00 2001 | 1 | From 606c807be8e01a4cc99a02b50717d9bce141e8a2 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 | 3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 |
4 | Subject: [PATCH 8/9] jdk: use correct include for signal | 4 | Subject: [PATCH 2005/2008] jdk: use correct include for signal |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -25,15 +25,16 @@ the following command: | |||
25 | 25 | ||
26 | Upstream-Status: Pending | 26 | Upstream-Status: Pending |
27 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 27 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
28 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
28 | --- | 29 | --- |
29 | jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- | 30 | src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- |
30 | jdk/src/macosx/javavm/export/jvm_md.h | 2 +- | 31 | src/macosx/javavm/export/jvm_md.h | 2 +- |
31 | jdk/src/solaris/javavm/export/jvm_md.h | 2 +- | 32 | src/solaris/javavm/export/jvm_md.h | 2 +- |
32 | jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- | 33 | src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- |
33 | 4 files changed, 4 insertions(+), 4 deletions(-) | 34 | 4 files changed, 4 insertions(+), 4 deletions(-) |
34 | 35 | ||
35 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 36 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
36 | index c0d58579..c4abb7ae 100644 | 37 | index c0d585796..c4abb7ae5 100644 |
37 | --- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 38 | --- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
38 | +++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 39 | +++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
39 | @@ -32,7 +32,7 @@ | 40 | @@ -32,7 +32,7 @@ |
@@ -46,7 +47,7 @@ index c0d58579..c4abb7ae 100644 | |||
46 | /* Also defined in src/aix/native/java/net/aix_close.c */ | 47 | /* Also defined in src/aix/native/java/net/aix_close.c */ |
47 | #define INTERRUPT_SIGNAL (SIGRTMAX - 1) | 48 | #define INTERRUPT_SIGNAL (SIGRTMAX - 1) |
48 | diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h | 49 | diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h |
49 | index 012bb1ba..0b575768 100644 | 50 | index 012bb1bab..0b5757683 100644 |
50 | --- a/jdk/src/macosx/javavm/export/jvm_md.h | 51 | --- a/jdk/src/macosx/javavm/export/jvm_md.h |
51 | +++ b/jdk/src/macosx/javavm/export/jvm_md.h | 52 | +++ b/jdk/src/macosx/javavm/export/jvm_md.h |
52 | @@ -60,7 +60,7 @@ | 53 | @@ -60,7 +60,7 @@ |
@@ -59,7 +60,7 @@ index 012bb1ba..0b575768 100644 | |||
59 | /* O Flags */ | 60 | /* O Flags */ |
60 | 61 | ||
61 | diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h | 62 | diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h |
62 | index 5c681914..62415ee2 100644 | 63 | index 5c681914b..62415ee25 100644 |
63 | --- a/jdk/src/solaris/javavm/export/jvm_md.h | 64 | --- a/jdk/src/solaris/javavm/export/jvm_md.h |
64 | +++ b/jdk/src/solaris/javavm/export/jvm_md.h | 65 | +++ b/jdk/src/solaris/javavm/export/jvm_md.h |
65 | @@ -65,7 +65,7 @@ | 66 | @@ -65,7 +65,7 @@ |
@@ -72,7 +73,7 @@ index 5c681914..62415ee2 100644 | |||
72 | /* O Flags */ | 73 | /* O Flags */ |
73 | 74 | ||
74 | diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 75 | diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
75 | index 5e2a78b7..204f0441 100644 | 76 | index 5e2a78b7a..204f0441a 100644 |
76 | --- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 77 | --- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
77 | +++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 78 | +++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
78 | @@ -34,7 +34,7 @@ | 79 | @@ -34,7 +34,7 @@ |
@@ -85,5 +86,5 @@ index 5e2a78b7..204f0441 100644 | |||
85 | #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) | 86 | #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) |
86 | #elif __solaris__ | 87 | #elif __solaris__ |
87 | -- | 88 | -- |
88 | 2.16.2 | 89 | 2.24.1 |
89 | 90 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch index 43130b5..dd5e051 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8ef989f82b29655e8d4532f14d5aa12a2999d850 Mon Sep 17 00:00:00 2001 | 1 | From 86de5eb9d031e7f8d241725d5eeaa7030cf2ce2b Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 | 3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 |
4 | Subject: [PATCH 10/10] jdk: disable backtrace() (musl build fix) | 4 | Subject: [PATCH 2006/2008] jdk: disable backtrace() (musl build fix) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -14,12 +14,13 @@ to fix the build on musl. | |||
14 | 14 | ||
15 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
16 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 16 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
17 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
17 | --- | 18 | --- |
18 | jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- | 19 | src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- |
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
20 | 21 | ||
21 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c | 22 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c |
22 | index 71d41f37..d3dc47cb 100644 | 23 | index 2425bf43a..1c8ebdb42 100644 |
23 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c | 24 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c |
24 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c | 25 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c |
25 | @@ -27,7 +27,7 @@ | 26 | @@ -27,7 +27,7 @@ |
@@ -31,7 +32,7 @@ index 71d41f37..d3dc47cb 100644 | |||
31 | #include <execinfo.h> | 32 | #include <execinfo.h> |
32 | #endif | 33 | #endif |
33 | 34 | ||
34 | @@ -799,7 +799,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv | 35 | @@ -803,7 +803,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv |
35 | return ret; | 36 | return ret; |
36 | } | 37 | } |
37 | 38 | ||
@@ -41,5 +42,5 @@ index 71d41f37..d3dc47cb 100644 | |||
41 | { | 42 | { |
42 | void *array[10]; | 43 | void *array[10]; |
43 | -- | 44 | -- |
44 | 2.16.2 | 45 | 2.24.1 |
45 | 46 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch new file mode 100644 index 0000000..8f3d134 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 0708dd8e56c1f28c2215561ba3035c8c538acef6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Rehsack <rehsack@gmail.com> | ||
3 | Date: Thu, 2 Jan 2020 13:25:12 +0100 | ||
4 | Subject: [PATCH 2007/2008] jdk: no genx11 in headless | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | make/GenerateSources.gmk | 8 +++++--- | ||
9 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/jdk/make/GenerateSources.gmk b/jdk/make/GenerateSources.gmk | ||
12 | index ba443f7da..2170150ac 100644 | ||
13 | --- a/jdk/make/GenerateSources.gmk | ||
14 | +++ b/jdk/make/GenerateSources.gmk | ||
15 | @@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows) | ||
16 | GENSRC += $(GENSRC_OSX_ICONS) | ||
17 | endif | ||
18 | |||
19 | - ifneq ($(OPENJDK_TARGET_OS), macosx) | ||
20 | - include gensrc/GensrcX11Wrappers.gmk | ||
21 | - GENSRC += $(GENSRC_X11WRAPPERS) | ||
22 | + ifndef BUILD_HEADLESS_ONLY | ||
23 | + ifneq ($(OPENJDK_TARGET_OS), macosx) | ||
24 | + include gensrc/GensrcX11Wrappers.gmk | ||
25 | + GENSRC += $(GENSRC_X11WRAPPERS) | ||
26 | + endif | ||
27 | endif | ||
28 | endif | ||
29 | |||
30 | -- | ||
31 | 2.24.1 | ||
32 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch index 7b5d998..e725bf9 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch | |||
@@ -1,6 +1,35 @@ | |||
1 | --- jdk/make/lib/Awt2dLibraries.gmk.orig | 1 | From 0bb17a5083efcfd02e96ef034e51a190ea678f15 Mon Sep 17 00:00:00 2001 |
2 | +++ jdk/make/lib/Awt2dLibraries.gmk | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | @@ -235,6 +235,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) | 3 | Date: Thu, 2 Jan 2020 13:26:42 +0100 |
4 | Subject: [PATCH 2008/2008] jdk: no unused deps | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | make/CompileNativeLibraries.gmk | 2 ++ | ||
9 | make/lib/Awt2dLibraries.gmk | 30 +++++++++++++++++------ | ||
10 | src/solaris/native/sun/awt/jawt.c | 2 +- | ||
11 | src/solaris/native/sun/awt/utility/rect.h | 2 +- | ||
12 | 4 files changed, 26 insertions(+), 10 deletions(-) | ||
13 | |||
14 | diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk | ||
15 | index c23b958b0..2984302f0 100644 | ||
16 | --- a/jdk/make/CompileNativeLibraries.gmk | ||
17 | +++ b/jdk/make/CompileNativeLibraries.gmk | ||
18 | @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk | ||
19 | |||
20 | include lib/Awt2dLibraries.gmk | ||
21 | |||
22 | +ifndef BUILD_SOUNDLESS_ONLY | ||
23 | include lib/SoundLibraries.gmk | ||
24 | +endif | ||
25 | |||
26 | # Include the corresponding custom file, if present. | ||
27 | -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk | ||
28 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | ||
29 | index cd8b94cd8..8d9c37246 100644 | ||
30 | --- a/jdk/make/lib/Awt2dLibraries.gmk | ||
31 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | ||
32 | @@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) | ||
4 | LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting | 33 | LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting |
5 | endif | 34 | endif |
6 | 35 | ||
@@ -11,7 +40,7 @@ | |||
11 | LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ | 40 | LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ |
12 | $(X_CFLAGS) \ | 41 | $(X_CFLAGS) \ |
13 | $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) | 42 | $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) |
14 | @@ -792,17 +796,28 @@ ifeq ($(BUILD_HEADLESS), true) | 43 | @@ -801,17 +805,28 @@ ifeq ($(BUILD_HEADLESS), true) |
15 | -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ | 44 | -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ |
16 | $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) | 45 | $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) |
17 | 46 | ||
@@ -45,7 +74,7 @@ | |||
45 | OGLBlitLoops.c \ | 74 | OGLBlitLoops.c \ |
46 | OGLBufImgOps.c \ | 75 | OGLBufImgOps.c \ |
47 | OGLContext.c \ | 76 | OGLContext.c \ |
48 | @@ -815,10 +830,9 @@ ifeq ($(BUILD_HEADLESS), true) | 77 | @@ -824,10 +839,9 @@ ifeq ($(BUILD_HEADLESS), true) |
49 | OGLSurfaceData.c \ | 78 | OGLSurfaceData.c \ |
50 | OGLTextRenderer.c \ | 79 | OGLTextRenderer.c \ |
51 | OGLVertexCache.c \ | 80 | OGLVertexCache.c \ |
@@ -58,20 +87,10 @@ | |||
58 | 87 | ||
59 | LIBAWT_HEADLESS_REORDER := | 88 | LIBAWT_HEADLESS_REORDER := |
60 | ifeq ($(OPENJDK_TARGET_OS), solaris) | 89 | ifeq ($(OPENJDK_TARGET_OS), solaris) |
61 | --- jdk/make/CompileNativeLibraries.gmk.orig | 90 | diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c |
62 | +++ jdk/make/CompileNativeLibraries.gmk | 91 | index 64284bc6e..b3584c7ef 100644 |
63 | @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk | 92 | --- a/jdk/src/solaris/native/sun/awt/jawt.c |
64 | 93 | +++ b/jdk/src/solaris/native/sun/awt/jawt.c | |
65 | include lib/Awt2dLibraries.gmk | ||
66 | |||
67 | +ifndef BUILD_SOUNDLESS_ONLY | ||
68 | include lib/SoundLibraries.gmk | ||
69 | +endif | ||
70 | |||
71 | # Include the corresponding custom file, if present. | ||
72 | -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk | ||
73 | --- jdk/src/solaris/native/sun/awt/jawt.c.orig | ||
74 | +++ jdk/src/solaris/native/sun/awt/jawt.c | ||
75 | @@ -33,7 +33,7 @@ | 94 | @@ -33,7 +33,7 @@ |
76 | */ | 95 | */ |
77 | JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt) | 96 | JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt) |
@@ -81,8 +100,10 @@ | |||
81 | /* there are no AWT libs available at all */ | 100 | /* there are no AWT libs available at all */ |
82 | return JNI_FALSE; | 101 | return JNI_FALSE; |
83 | #else | 102 | #else |
84 | --- jdk/src/solaris/native/sun/awt/utility/rect.h.orig | 103 | diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h |
85 | +++ jdk/src/solaris/native/sun/awt/utility/rect.h | 104 | index ceea38f43..8d85782ba 100644 |
105 | --- a/jdk/src/solaris/native/sun/awt/utility/rect.h | ||
106 | +++ b/jdk/src/solaris/native/sun/awt/utility/rect.h | ||
86 | @@ -28,7 +28,7 @@ | 107 | @@ -28,7 +28,7 @@ |
87 | #ifndef _AWT_RECT_H | 108 | #ifndef _AWT_RECT_H |
88 | #define _AWT_RECT_H | 109 | #define _AWT_RECT_H |
@@ -92,3 +113,6 @@ | |||
92 | #include <X11/Xlib.h> | 113 | #include <X11/Xlib.h> |
93 | typedef XRectangle RECT_T; | 114 | typedef XRectangle RECT_T; |
94 | #else | 115 | #else |
116 | -- | ||
117 | 2.24.1 | ||
118 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch index bedc448..bedc448 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch +++ b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-shark-build-pt2.patch index b09745c..b09745c 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch +++ b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-shark-build-pt2.patch | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-remaining-musl-fixes.patch index 1140887..1140887 100644 --- a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch +++ b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-remaining-musl-fixes.patch | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch b/recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-Fix-further-functions-with-a-missing.patch index 0216c68..0216c68 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch +++ b/recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-Fix-further-functions-with-a-missing.patch | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch b/recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-remaining-musl-fixes.patch index 436f012..436f012 100644 --- a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch +++ b/recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-remaining-musl-fixes.patch | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch b/recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch deleted file mode 100644 index b901001..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- common/autoconf/basics.m4.orig | ||
2 | +++ common/autoconf/basics.m4 | ||
3 | @@ -448,7 +448,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], | ||
4 | files_present=`$LS $OUTPUT_ROOT` | ||
5 | # Configure has already touched config.log and confdefs.h in the current dir when this check | ||
6 | # is performed. | ||
7 | - filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \ | ||
8 | + filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's,aclocal-copy,,g' -e 's/ //g' \ | ||
9 | | $TR -d '\n'` | ||
10 | if test "x$filtered_files" != x; then | ||
11 | AC_MSG_NOTICE([Current directory is $CURDIR.]) | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot-handle-gcc7-format-overflow.patch b/recipes-core/openjdk/patches-openjdk-8/hotspot-handle-gcc7-format-overflow.patch deleted file mode 100644 index 83626b3..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/hotspot-handle-gcc7-format-overflow.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | # HG changeset patch | ||
2 | # User Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> | ||
3 | # Date 1537519446 -7200 | ||
4 | # Fri Sep 21 10:44:06 2018 +0200 | ||
5 | # Node ID 213da2c3ee54a558abd30b0230afa40d4b4e7f83 | ||
6 | # Parent 80ee2541504ec08d65da9d968a18a00a69858ce0 | ||
7 | Handle format error for GCC >= 7 | ||
8 | |||
9 | diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp | ||
10 | --- a/hotspot/src/share/vm/adlc/output_c.cpp | ||
11 | +++ b/hotspot/src/share/vm/adlc/output_c.cpp | ||
12 | @@ -436,9 +436,11 @@ | ||
13 | for (i = maxcycleused; i > 0; i /= 10) | ||
14 | cycledigit++; | ||
15 | |||
16 | - int maskdigit = 0; | ||
17 | - for (i = rescount; i > 0; i /= 10) | ||
18 | + int maskdigit = 1; | ||
19 | + for (i = rescount / 10; i > 0; i /= 10) | ||
20 | maskdigit++; | ||
21 | + if (maskdigit > 10) | ||
22 | + maskdigit = 10; | ||
23 | |||
24 | static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; | ||
25 | static const char* pipeline_use_element = "Pipeline_Use_Element"; | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-add-missing-linker-flags.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-add-missing-linker-flags.patch deleted file mode 100644 index 92f29b0..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-add-missing-linker-flags.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | makefiles: Add missing EXTRA_LDFLAGS to certain files | ||
2 | |||
3 | EXTRA_LDFLAGS were not used when building certain shared objects. This | ||
4 | means that the Yocto specific linker flags were lost, which caused build | ||
5 | failures due to a bad hash style. | ||
6 | |||
7 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | --- | ||
11 | hotspot/make/linux/makefiles/jsig.make | 2 +- | ||
12 | hotspot/make/linux/makefiles/saproc.make | 2 +- | ||
13 | hotspot/make/linux/makefiles/vm.make | 2 +- | ||
14 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git hotspot/make/linux/makefiles/jsig.make hotspot/make/linux/makefiles/jsig.make | ||
17 | index ce29eb1..e1d6c07 100644 | ||
18 | --- hotspot/make/linux/makefiles/jsig.amake | ||
19 | +++ hotspot/make/linux/makefiles/jsig.make | ||
20 | @@ -44,7 +44,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig | ||
21 | # cause problems with interposing. See CR: 6466665 | ||
22 | # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) | ||
23 | |||
24 | -LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) | ||
25 | +LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) | ||
26 | |||
27 | # DEBUG_BINARIES overrides everything, use full -g debug information | ||
28 | ifeq ($(DEBUG_BINARIES), true) | ||
29 | diff --git hotspot/make/linux/makefiles/saproc.make hotspot/make/linux/makefiles/saproc.make | ||
30 | index 7c6e4a8..369a0ba 100644 | ||
31 | --- hotspot/make/linux/makefiles/saproc.make | ||
32 | +++ hotspot/make/linux/makefiles/saproc.make | ||
33 | @@ -73,7 +73,7 @@ ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR | ||
34 | else | ||
35 | ALT_SAINCDIR= | ||
36 | endif | ||
37 | -SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) | ||
38 | +SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) | ||
39 | |||
40 | SAARCH ?= $(BUILDARCH) | ||
41 | |||
42 | diff --git hotspot/make/linux/makefiles/vm.make hotspot/make/linux/makefiles/vm.make | ||
43 | index 1a48df9..72f8d11 100644 | ||
44 | --- hotspot/make/linux/makefiles/vm.make | ||
45 | +++ hotspot/make/linux/makefiles/vm.make | ||
46 | @@ -122,7 +122,7 @@ CFLAGS += $(CFLAGS/NOEX) | ||
47 | |||
48 | # Extra flags from gnumake's invocation or environment | ||
49 | CFLAGS += $(EXTRA_CFLAGS) | ||
50 | -LFLAGS += $(EXTRA_CFLAGS) | ||
51 | +LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) | ||
52 | |||
53 | # Don't set excutable bit on stack segment | ||
54 | # the same could be done by separate execstack command | ||
55 | -- | ||
56 | 2.7.4 | ||
57 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch deleted file mode 100644 index 91d258d..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch +++ /dev/null | |||
@@ -1,140 +0,0 @@ | |||
1 | --- common/autoconf/toolchain.m4.orig | ||
2 | +++ common/autoconf/toolchain.m4 | ||
3 | @@ -77,7 +77,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSI | ||
4 | # $2 = human readable name of compiler (C or C++) | ||
5 | AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], | ||
6 | [ | ||
7 | - COMPILER=[$]$1 | ||
8 | + COMPILER="[$]$1" | ||
9 | COMPILER_NAME=$2 | ||
10 | |||
11 | if test "x$OPENJDK_TARGET_OS" = xsolaris; then | ||
12 | @@ -174,64 +174,37 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], | ||
13 | [ | ||
14 | COMPILER_NAME=$2 | ||
15 | |||
16 | - $1= | ||
17 | + FOUND_$1= | ||
18 | + | ||
19 | + if test "x[$]$1" != "x"; then | ||
20 | + FOUND_$1="[$]$1" | ||
21 | + fi | ||
22 | + | ||
23 | # If TOOLS_DIR is set, check for all compiler names in there first | ||
24 | # before checking the rest of the PATH. | ||
25 | - if test -n "$TOOLS_DIR"; then | ||
26 | + if test "x[$]FOUND_$1" = x -a -n "$TOOLS_DIR"; then | ||
27 | PATH_save="$PATH" | ||
28 | PATH="$TOOLS_DIR" | ||
29 | AC_PATH_PROGS(TOOLS_DIR_$1, $3) | ||
30 | - $1=$TOOLS_DIR_$1 | ||
31 | + FOUND_$1=$TOOLS_DIR_$1 | ||
32 | PATH="$PATH_save" | ||
33 | fi | ||
34 | |||
35 | # AC_PATH_PROGS can't be run multiple times with the same variable, | ||
36 | # so create a new name for this run. | ||
37 | - if test "x[$]$1" = x; then | ||
38 | + if test "x[$]FOUND_$1" = x; then | ||
39 | AC_PATH_PROGS(POTENTIAL_$1, $3) | ||
40 | - $1=$POTENTIAL_$1 | ||
41 | + FOUND_$1=$POTENTIAL_$1 | ||
42 | fi | ||
43 | |||
44 | - if test "x[$]$1" = x; then | ||
45 | + if test "x[$]FOUND_$1" = x; then | ||
46 | HELP_MSG_MISSING_DEPENDENCY([devkit]) | ||
47 | AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG]) | ||
48 | fi | ||
49 | - BASIC_FIXUP_EXECUTABLE($1) | ||
50 | - TEST_COMPILER="[$]$1" | ||
51 | - # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links | ||
52 | - # to 'xlc' but it is crucial that we invoke the compiler with the right name! | ||
53 | - if test "x$OPENJDK_BUILD_OS" != xaix; then | ||
54 | - AC_MSG_CHECKING([resolved symbolic links for $1]) | ||
55 | - BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER) | ||
56 | - AC_MSG_RESULT([$TEST_COMPILER]) | ||
57 | - fi | ||
58 | - AC_MSG_CHECKING([if $1 is disguised ccache]) | ||
59 | - | ||
60 | - COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"` | ||
61 | - if test "x$COMPILER_BASENAME" = "xccache"; then | ||
62 | - AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler]) | ||
63 | - # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache. | ||
64 | - # We want to control ccache invocation ourselves, so ignore this cc and try | ||
65 | - # searching again. | ||
66 | - | ||
67 | - # Remove the path to the fake ccache cc from the PATH | ||
68 | - RETRY_COMPILER_SAVED_PATH="$PATH" | ||
69 | - COMPILER_DIRNAME=`$DIRNAME [$]$1` | ||
70 | - PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`" | ||
71 | - | ||
72 | - # Try again looking for our compiler | ||
73 | - AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3) | ||
74 | - BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1) | ||
75 | - PATH="$RETRY_COMPILER_SAVED_PATH" | ||
76 | - | ||
77 | - AC_MSG_CHECKING([for resolved symbolic links for $1]) | ||
78 | - BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1) | ||
79 | - AC_MSG_RESULT([$PROPER_COMPILER_$1]) | ||
80 | - $1="$PROPER_COMPILER_$1" | ||
81 | - else | ||
82 | - AC_MSG_RESULT([no, keeping $1]) | ||
83 | - $1="$TEST_COMPILER" | ||
84 | - fi | ||
85 | + BASIC_FIXUP_EXECUTABLE(FOUND_$1) | ||
86 | + TEST_COMPILER="[$]FOUND_$1" | ||
87 | + | ||
88 | + $1="$TEST_COMPILER" | ||
89 | TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME]) | ||
90 | ]) | ||
91 | |||
92 | @@ -265,12 +238,12 @@ AC_DEFUN([TOOLCHAIN_SETUP_PATHS], | ||
93 | # otherwise we might pick up cross-compilers which don't use standard naming. | ||
94 | # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have | ||
95 | # to wait until they are properly discovered. | ||
96 | - AC_PATH_PROGS(BUILD_CC, [cl cc gcc]) | ||
97 | - BASIC_FIXUP_EXECUTABLE(BUILD_CC) | ||
98 | - AC_PATH_PROGS(BUILD_CXX, [cl CC g++]) | ||
99 | - BASIC_FIXUP_EXECUTABLE(BUILD_CXX) | ||
100 | - AC_PATH_PROG(BUILD_LD, ld) | ||
101 | - BASIC_FIXUP_EXECUTABLE(BUILD_LD) | ||
102 | + AS_IF([test "x${BUILD_CC}" = "x"], [AC_PATH_PROGS(BUILD_CC, [cl cc gcc]) | ||
103 | + BASIC_FIXUP_EXECUTABLE(BUILD_CC)]) | ||
104 | + AS_IF([test "x${BUILD_CXX}" = "x"], [AC_PATH_PROGS(BUILD_CXX, [cl CC g++]) | ||
105 | + BASIC_FIXUP_EXECUTABLE(BUILD_CXX)]) | ||
106 | + AS_IF([test "x${BUILD_LD}" = "x"], [AC_PATH_PROG(BUILD_LD, ld) | ||
107 | + BASIC_FIXUP_EXECUTABLE(BUILD_LD)]) | ||
108 | fi | ||
109 | AC_SUBST(BUILD_CC) | ||
110 | AC_SUBST(BUILD_CXX) | ||
111 | --- common/autoconf/basics.m4.orig | ||
112 | +++ common/autoconf/basics.m4 | ||
113 | @@ -171,8 +171,15 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], | ||
114 | fi | ||
115 | fi | ||
116 | |||
117 | + # First separate the path from the arguments. This will split at the first | ||
118 | + # space. | ||
119 | + complete="[$]$1" | ||
120 | + path="${complete%% *}" | ||
121 | + tmp="$complete EOL" | ||
122 | + arguments="${tmp#* }" | ||
123 | + | ||
124 | if test "x$READLINK" != x; then | ||
125 | - $1=`$READLINK -f [$]$1` | ||
126 | + new_path=`$READLINK -f $path` | ||
127 | else | ||
128 | # Save the current directory for restoring afterwards | ||
129 | STARTDIR=$PWD | ||
130 | @@ -198,8 +205,9 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], | ||
131 | let COUNTER=COUNTER+1 | ||
132 | done | ||
133 | cd $STARTDIR | ||
134 | - $1=$sym_link_dir/$sym_link_file | ||
135 | + new_path=$sym_link_dir/$sym_link_file | ||
136 | fi | ||
137 | + $1="$new_path ${arguments% *}" | ||
138 | fi | ||
139 | ]) | ||
140 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch deleted file mode 100644 index 3e4f156..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Delay $CXX insertion until after make has evaluated the comma-separated list, | ||
2 | as any comma separated parameters in CXX (such as assembler arguments) would | ||
3 | break the build | ||
4 | |||
5 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- | ||
10 | --- make/common/NativeCompilation.gmk | ||
11 | +++ make/common/NativeCompilation.gmk | ||
12 | @@ -376,7 +376,7 @@ define SetupNativeCompilation | ||
13 | $$(foreach p,$$($1_SRCS), \ | ||
14 | $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ | ||
15 | $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \ | ||
16 | - $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS)))) | ||
17 | + $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$$(CXX),$$($1_ASFLAGS)))) | ||
18 | |||
19 | # On windows we need to create a resource file | ||
20 | ifeq ($(OPENJDK_TARGET_OS), windows) | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-libpng-neon-build.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-libpng-neon-build.patch deleted file mode 100644 index dd6d8e3..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-libpng-neon-build.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | # HG changeset patch | ||
2 | # User enevill | ||
3 | # Date 1430816900 0 | ||
4 | # Tue May 05 09:08:20 2015 +0000 | ||
5 | # Node ID 88d2b7d7285281d41bcff45af0dd983b0f72811e | ||
6 | # Parent 51f5501a54a62aceed6342e7ea3a9a3c67f3885d | ||
7 | 8078245: AARCH64: JDK fails to build due to undefined symbol in libpng | ||
8 | Summary: Add -DPNG_ARM_NEON_OPT=0 to LIBSPLASHSCREEN_CFLAGS flags | ||
9 | Reviewed-by: dholmes, ihse, erikj | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> | ||
14 | --- | ||
15 | jdk/make/lib/Awt2dLibraries.gmk | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git jdk/make/lib/Awt2dLibraries.gmk jdk/make/lib/Awt2dLibraries.gmk | ||
19 | --- jdk/make/lib/Awt2dLibraries.gmk | ||
20 | +++ jdk/make/lib/Awt2dLibraries.gmk | ||
21 | @@ -1205,7 +1205,7 @@ ifndef BUILD_HEADLESS_ONLY | ||
22 | LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen | ||
23 | endif | ||
24 | |||
25 | - LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \ | ||
26 | + LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \ | ||
27 | $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir)) | ||
28 | |||
29 | ifeq ($(OPENJDK_TARGET_OS), macosx) | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch index 018640b..b09745c 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch | |||
@@ -1,38 +1,11 @@ | |||
1 | --- hotspot/src/cpu/zero/vm/entry_zero.hpp.orig | 1 | --- hotspot/src/cpu/zero/vm/entry_zero.hpp |
2 | +++ hotspot/src/cpu/zero/vm/entry_zero.hpp | 2 | +++ hotspot/src/cpu/zero/vm/entry_zero.hpp |
3 | @@ -26,6 +26,10 @@ | 3 | @@ -26,6 +26,8 @@ |
4 | #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP | 4 | #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP |
5 | #define CPU_ZERO_VM_ENTRY_ZERO_HPP | 5 | #define CPU_ZERO_VM_ENTRY_ZERO_HPP |
6 | 6 | ||
7 | +#include "utilities/globalDefinitions.hpp" | 7 | +#include "utilities/globalDefinitions.hpp" |
8 | +#include "utilities/exceptions.hpp" | 8 | +#include "utilities/exceptions.hpp" |
9 | +#include "interpreter/cppInterpreter.hpp" | 9 | #include "interpreter/cppInterpreter.hpp" |
10 | + | ||
11 | class ZeroEntry { | ||
12 | public: | ||
13 | ZeroEntry() { | ||
14 | --- hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp.orig | ||
15 | +++ hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp | ||
16 | @@ -30,6 +30,10 @@ | ||
17 | |||
18 | #ifdef CC_INTERP | ||
19 | 10 | ||
20 | +#ifdef TARGET_ARCH_zero | 11 | class ZeroEntry { |
21 | +#include "entry_zero.hpp" | ||
22 | +#endif | ||
23 | + | ||
24 | class CppInterpreterGenerator: public AbstractInterpreterGenerator { | ||
25 | protected: | ||
26 | // shared code sequences | ||
27 | --- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig | ||
28 | +++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | ||
29 | @@ -26,6 +26,9 @@ | ||
30 | #include "precompiled.hpp" | ||
31 | #include "assembler_zero.inline.hpp" | ||
32 | #include "memory/resourceArea.hpp" | ||
33 | +#ifdef CC_INTERP | ||
34 | +#include "entry_zero.hpp" | ||
35 | +#endif | ||
36 | #include "nativeInst_zero.hpp" | ||
37 | #include "oops/oop.inline.hpp" | ||
38 | #include "runtime/handles.hpp" | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch deleted file mode 100644 index 12fc17d..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch +++ /dev/null | |||
@@ -1,2631 +0,0 @@ | |||
1 | --- hotspot/src/os/posix/vm/os_posix.cpp.orig | ||
2 | +++ hotspot/src/os/posix/vm/os_posix.cpp | ||
3 | @@ -594,7 +594,7 @@ const char* os::Posix::describe_sa_flags | ||
4 | strncpy(buffer, "none", size); | ||
5 | |||
6 | const struct { | ||
7 | - int i; | ||
8 | + unsigned i; | ||
9 | const char* s; | ||
10 | } flaginfo [] = { | ||
11 | { SA_NOCLDSTOP, "SA_NOCLDSTOP" }, | ||
12 | --- hotspot/src/share/vm/classfile/dictionary.hpp.orig | ||
13 | +++ hotspot/src/share/vm/classfile/dictionary.hpp | ||
14 | @@ -373,7 +373,7 @@ class SymbolPropertyEntry : public Hasht | ||
15 | |||
16 | void print_on(outputStream* st) const { | ||
17 | symbol()->print_value_on(st); | ||
18 | - st->print("/mode="INTX_FORMAT, symbol_mode()); | ||
19 | + st->print("/mode=" INTX_FORMAT, symbol_mode()); | ||
20 | st->print(" -> "); | ||
21 | bool printed = false; | ||
22 | if (method() != NULL) { | ||
23 | --- hotspot/src/share/vm/code/exceptionHandlerTable.cpp.orig | ||
24 | +++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp | ||
25 | @@ -186,7 +186,7 @@ uint ImplicitExceptionTable::at( uint ex | ||
26 | void ImplicitExceptionTable::print(address base) const { | ||
27 | tty->print("{"); | ||
28 | for( uint i=0; i<len(); i++ ) | ||
29 | - tty->print("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1)); | ||
30 | + tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1)); | ||
31 | tty->print_cr("}"); | ||
32 | } | ||
33 | |||
34 | --- hotspot/src/share/vm/code/nmethod.cpp.orig | ||
35 | +++ hotspot/src/share/vm/code/nmethod.cpp | ||
36 | @@ -2344,7 +2344,7 @@ public: | ||
37 | void maybe_print(oop* p) { | ||
38 | if (_print_nm == NULL) return; | ||
39 | if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root"); | ||
40 | - tty->print_cr(""PTR_FORMAT"[offset=%d] detected scavengable oop "PTR_FORMAT" (found at "PTR_FORMAT")", | ||
41 | + tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")", | ||
42 | _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm), | ||
43 | (void *)(*p), (intptr_t)p); | ||
44 | (*p)->print(); | ||
45 | @@ -2725,7 +2725,7 @@ public: | ||
46 | _nm->print_nmethod(true); | ||
47 | _ok = false; | ||
48 | } | ||
49 | - tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)", | ||
50 | + tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)", | ||
51 | (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); | ||
52 | } | ||
53 | virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); } | ||
54 | @@ -2849,7 +2849,7 @@ public: | ||
55 | _nm->print_nmethod(true); | ||
56 | _ok = false; | ||
57 | } | ||
58 | - tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)", | ||
59 | + tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)", | ||
60 | (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); | ||
61 | (*p)->print(); | ||
62 | } | ||
63 | @@ -2894,7 +2894,7 @@ void nmethod::print() const { | ||
64 | print_on(tty, NULL); | ||
65 | |||
66 | if (WizardMode) { | ||
67 | - tty->print("((nmethod*) "INTPTR_FORMAT ") ", this); | ||
68 | + tty->print("((nmethod*) " INTPTR_FORMAT ") ", this); | ||
69 | tty->print(" for method " INTPTR_FORMAT , (address)method()); | ||
70 | tty->print(" { "); | ||
71 | if (is_in_use()) tty->print("in_use "); | ||
72 | --- hotspot/src/share/vm/compiler/compileBroker.cpp.orig | ||
73 | +++ hotspot/src/share/vm/compiler/compileBroker.cpp | ||
74 | @@ -203,7 +203,7 @@ class CompilationLog : public StringEven | ||
75 | } | ||
76 | |||
77 | void log_nmethod(JavaThread* thread, nmethod* nm) { | ||
78 | - log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]", | ||
79 | + log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", | ||
80 | nm->compile_id(), nm->is_osr_method() ? "%" : "", | ||
81 | p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end())); | ||
82 | } | ||
83 | --- hotspot/src/share/vm/compiler/disassembler.cpp.orig | ||
84 | +++ hotspot/src/share/vm/compiler/disassembler.cpp | ||
85 | @@ -63,7 +63,7 @@ bool Disassembler::_tried_to_load | ||
86 | Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL; | ||
87 | Disassembler::decode_func Disassembler::_decode_instructions = NULL; | ||
88 | |||
89 | -static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH; | ||
90 | +static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH; | ||
91 | static const char decode_instructions_virtual_name[] = "decode_instructions_virtual"; | ||
92 | static const char decode_instructions_name[] = "decode_instructions"; | ||
93 | static bool use_new_version = true; | ||
94 | --- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.orig | ||
95 | +++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | ||
96 | @@ -838,18 +838,18 @@ void ConcurrentMarkSweepGeneration::prin | ||
97 | GenCollectedHeap* gch = GenCollectedHeap::heap(); | ||
98 | if (PrintGCDetails) { | ||
99 | if (Verbose) { | ||
100 | - gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]", | ||
101 | + gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "(" SIZE_FORMAT ")]", | ||
102 | level(), short_name(), s, used(), capacity()); | ||
103 | } else { | ||
104 | - gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]", | ||
105 | + gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)]", | ||
106 | level(), short_name(), s, used() / K, capacity() / K); | ||
107 | } | ||
108 | } | ||
109 | if (Verbose) { | ||
110 | - gclog_or_tty->print(" "SIZE_FORMAT"("SIZE_FORMAT")", | ||
111 | + gclog_or_tty->print(" " SIZE_FORMAT "(" SIZE_FORMAT ")", | ||
112 | gch->used(), gch->capacity()); | ||
113 | } else { | ||
114 | - gclog_or_tty->print(" "SIZE_FORMAT"K("SIZE_FORMAT"K)", | ||
115 | + gclog_or_tty->print(" " SIZE_FORMAT "K(" SIZE_FORMAT "K)", | ||
116 | gch->used() / K, gch->capacity() / K); | ||
117 | } | ||
118 | } | ||
119 | @@ -879,8 +879,8 @@ bool ConcurrentMarkSweepGeneration::prom | ||
120 | bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); | ||
121 | if (Verbose && PrintGCDetails) { | ||
122 | gclog_or_tty->print_cr( | ||
123 | - "CMS: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT")," | ||
124 | - "max_promo("SIZE_FORMAT")", | ||
125 | + "CMS: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT ")," | ||
126 | + "max_promo(" SIZE_FORMAT ")", | ||
127 | res? "":" not", available, res? ">=":"<", | ||
128 | av_promo, max_promotion_in_bytes); | ||
129 | } | ||
130 | @@ -966,8 +966,8 @@ void ConcurrentMarkSweepGeneration::comp | ||
131 | desired_free_percentage); | ||
132 | gclog_or_tty->print_cr(" Maximum free fraction %f", | ||
133 | maximum_free_percentage); | ||
134 | - gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000); | ||
135 | - gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT, | ||
136 | + gclog_or_tty->print_cr(" Capactiy " SIZE_FORMAT, capacity()/1000); | ||
137 | + gclog_or_tty->print_cr(" Desired capacity " SIZE_FORMAT, | ||
138 | desired_capacity/1000); | ||
139 | int prev_level = level() - 1; | ||
140 | if (prev_level >= 0) { | ||
141 | @@ -975,14 +975,14 @@ void ConcurrentMarkSweepGeneration::comp | ||
142 | GenCollectedHeap* gch = GenCollectedHeap::heap(); | ||
143 | Generation* prev_gen = gch->_gens[prev_level]; | ||
144 | prev_size = prev_gen->capacity(); | ||
145 | - gclog_or_tty->print_cr(" Younger gen size "SIZE_FORMAT, | ||
146 | + gclog_or_tty->print_cr(" Younger gen size " SIZE_FORMAT, | ||
147 | prev_size/1000); | ||
148 | } | ||
149 | - gclog_or_tty->print_cr(" unsafe_max_alloc_nogc "SIZE_FORMAT, | ||
150 | + gclog_or_tty->print_cr(" unsafe_max_alloc_nogc " SIZE_FORMAT, | ||
151 | unsafe_max_alloc_nogc()/1000); | ||
152 | - gclog_or_tty->print_cr(" contiguous available "SIZE_FORMAT, | ||
153 | + gclog_or_tty->print_cr(" contiguous available " SIZE_FORMAT, | ||
154 | contiguous_available()/1000); | ||
155 | - gclog_or_tty->print_cr(" Expand by "SIZE_FORMAT" (bytes)", | ||
156 | + gclog_or_tty->print_cr(" Expand by " SIZE_FORMAT " (bytes)", | ||
157 | expand_bytes); | ||
158 | } | ||
159 | // safe if expansion fails | ||
160 | @@ -1513,8 +1513,8 @@ bool CMSCollector::shouldConcurrentColle | ||
161 | stats().print_on(gclog_or_tty); | ||
162 | gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f", | ||
163 | stats().time_until_cms_gen_full()); | ||
164 | - gclog_or_tty->print_cr("free="SIZE_FORMAT, _cmsGen->free()); | ||
165 | - gclog_or_tty->print_cr("contiguous_available="SIZE_FORMAT, | ||
166 | + gclog_or_tty->print_cr("free=" SIZE_FORMAT, _cmsGen->free()); | ||
167 | + gclog_or_tty->print_cr("contiguous_available=" SIZE_FORMAT, | ||
168 | _cmsGen->contiguous_available()); | ||
169 | gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate()); | ||
170 | gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate()); | ||
171 | @@ -2792,7 +2792,7 @@ void ConcurrentMarkSweepGeneration::gc_p | ||
172 | assert(_numObjectsPromoted == 0, "check"); | ||
173 | assert(_numWordsPromoted == 0, "check"); | ||
174 | if (Verbose && PrintGC) { | ||
175 | - gclog_or_tty->print("Allocated "SIZE_FORMAT" objects, " | ||
176 | + gclog_or_tty->print("Allocated " SIZE_FORMAT " objects, " | ||
177 | SIZE_FORMAT" bytes concurrently", | ||
178 | _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord)); | ||
179 | } | ||
180 | @@ -2879,7 +2879,7 @@ void ConcurrentMarkSweepGeneration::gc_e | ||
181 | assert(_numObjectsAllocated == 0, "check"); | ||
182 | assert(_numWordsAllocated == 0, "check"); | ||
183 | if (Verbose && PrintGC) { | ||
184 | - gclog_or_tty->print("Promoted "SIZE_FORMAT" objects, " | ||
185 | + gclog_or_tty->print("Promoted " SIZE_FORMAT " objects, " | ||
186 | SIZE_FORMAT" bytes", | ||
187 | _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord)); | ||
188 | } | ||
189 | @@ -2890,7 +2890,7 @@ void ConcurrentMarkSweepGeneration::gc_e | ||
190 | if (PrintGC && Verbose) { | ||
191 | // Call down the chain in contiguous_available needs the freelistLock | ||
192 | // so print this out before releasing the freeListLock. | ||
193 | - gclog_or_tty->print(" Contiguous available "SIZE_FORMAT" bytes ", | ||
194 | + gclog_or_tty->print(" Contiguous available " SIZE_FORMAT " bytes ", | ||
195 | contiguous_available()); | ||
196 | } | ||
197 | } | ||
198 | @@ -2978,7 +2978,7 @@ class VerifyMarkedClosure: public BitMap | ||
199 | HeapWord* addr = _marks->offsetToHeapWord(offset); | ||
200 | if (!_marks->isMarked(addr)) { | ||
201 | oop(addr)->print_on(gclog_or_tty); | ||
202 | - gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr); | ||
203 | + gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr); | ||
204 | _failed = true; | ||
205 | } | ||
206 | return true; | ||
207 | @@ -5039,7 +5039,7 @@ void CMSCollector::checkpointRootsFinal( | ||
208 | |||
209 | SpecializationStats::clear(); | ||
210 | if (PrintGCDetails) { | ||
211 | - gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]", | ||
212 | + gclog_or_tty->print("[YG occupancy: " SIZE_FORMAT " K (" SIZE_FORMAT " K)]", | ||
213 | _young_gen->used() / K, | ||
214 | _young_gen->capacity() / K); | ||
215 | } | ||
216 | @@ -5172,8 +5172,8 @@ void CMSCollector::checkpointRootsFinalW | ||
217 | if (ser_ovflw > 0) { | ||
218 | if (PrintCMSStatistics != 0) { | ||
219 | gclog_or_tty->print_cr("Marking stack overflow (benign) " | ||
220 | - "(pmc_pc="SIZE_FORMAT", pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT | ||
221 | - ", kac_preclean="SIZE_FORMAT")", | ||
222 | + "(pmc_pc=" SIZE_FORMAT ", pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT | ||
223 | + ", kac_preclean=" SIZE_FORMAT ")", | ||
224 | _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw, | ||
225 | _ser_kac_ovflw, _ser_kac_preclean_ovflw); | ||
226 | } | ||
227 | @@ -5186,7 +5186,7 @@ void CMSCollector::checkpointRootsFinalW | ||
228 | if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) { | ||
229 | if (PrintCMSStatistics != 0) { | ||
230 | gclog_or_tty->print_cr("Work queue overflow (benign) " | ||
231 | - "(pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT")", | ||
232 | + "(pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT ")", | ||
233 | _par_pmc_remark_ovflw, _par_kac_ovflw); | ||
234 | } | ||
235 | _par_pmc_remark_ovflw = 0; | ||
236 | @@ -5194,12 +5194,12 @@ void CMSCollector::checkpointRootsFinalW | ||
237 | } | ||
238 | if (PrintCMSStatistics != 0) { | ||
239 | if (_markStack._hit_limit > 0) { | ||
240 | - gclog_or_tty->print_cr(" (benign) Hit max stack size limit ("SIZE_FORMAT")", | ||
241 | + gclog_or_tty->print_cr(" (benign) Hit max stack size limit (" SIZE_FORMAT ")", | ||
242 | _markStack._hit_limit); | ||
243 | } | ||
244 | if (_markStack._failed_double > 0) { | ||
245 | - gclog_or_tty->print_cr(" (benign) Failed stack doubling ("SIZE_FORMAT")," | ||
246 | - " current capacity "SIZE_FORMAT, | ||
247 | + gclog_or_tty->print_cr(" (benign) Failed stack doubling (" SIZE_FORMAT ")," | ||
248 | + " current capacity " SIZE_FORMAT, | ||
249 | _markStack._failed_double, | ||
250 | _markStack.capacity()); | ||
251 | } | ||
252 | @@ -5963,7 +5963,7 @@ void CMSCollector::do_remark_non_paralle | ||
253 | &markFromDirtyCardsClosure); | ||
254 | verify_work_stacks_empty(); | ||
255 | if (PrintCMSStatistics != 0) { | ||
256 | - gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in cms gen) ", | ||
257 | + gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in cms gen) ", | ||
258 | markFromDirtyCardsClosure.num_dirty_cards()); | ||
259 | } | ||
260 | } | ||
261 | @@ -6893,7 +6893,7 @@ void CMSMarkStack::expand() { | ||
262 | } else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) { | ||
263 | // Failed to double capacity, continue; | ||
264 | // we print a detail message only once per CMS cycle. | ||
265 | - gclog_or_tty->print(" (benign) Failed to expand marking stack from "SIZE_FORMAT"K to " | ||
266 | + gclog_or_tty->print(" (benign) Failed to expand marking stack from " SIZE_FORMAT "K to " | ||
267 | SIZE_FORMAT"K", | ||
268 | _capacity / K, new_capacity / K); | ||
269 | } | ||
270 | @@ -8216,25 +8216,25 @@ SweepClosure::~SweepClosure() { | ||
271 | ShouldNotReachHere(); | ||
272 | } | ||
273 | if (Verbose && PrintGC) { | ||
274 | - gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes", | ||
275 | + gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes", | ||
276 | _numObjectsFreed, _numWordsFreed*sizeof(HeapWord)); | ||
277 | - gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, " | ||
278 | + gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, " | ||
279 | SIZE_FORMAT" bytes " | ||
280 | - "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes", | ||
281 | + "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes", | ||
282 | _numObjectsLive, _numWordsLive*sizeof(HeapWord), | ||
283 | _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord)); | ||
284 | size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree) | ||
285 | * sizeof(HeapWord); | ||
286 | - gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes); | ||
287 | + gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes); | ||
288 | |||
289 | if (PrintCMSStatistics && CMSVerifyReturnedBytes) { | ||
290 | size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes(); | ||
291 | size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes(); | ||
292 | size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes; | ||
293 | - gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes); | ||
294 | - gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes", | ||
295 | + gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes); | ||
296 | + gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes", | ||
297 | indexListReturnedBytes); | ||
298 | - gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes", | ||
299 | + gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes", | ||
300 | dict_returned_bytes); | ||
301 | } | ||
302 | } | ||
303 | @@ -8313,13 +8313,13 @@ size_t SweepClosure::do_blk_careful(Heap | ||
304 | // coalesced chunk to the appropriate free list. | ||
305 | if (inFreeRange()) { | ||
306 | assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit, | ||
307 | - err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger())); | ||
308 | + err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger())); | ||
309 | flush_cur_free_chunk(freeFinger(), | ||
310 | pointer_delta(addr, freeFinger())); | ||
311 | if (CMSTraceSweeper) { | ||
312 | gclog_or_tty->print("Sweep: last chunk: "); | ||
313 | - gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") " | ||
314 | - "[coalesced:"SIZE_FORMAT"]\n", | ||
315 | + gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") " | ||
316 | + "[coalesced:" SIZE_FORMAT "]\n", | ||
317 | freeFinger(), pointer_delta(addr, freeFinger()), | ||
318 | lastFreeRangeCoalesced()); | ||
319 | } | ||
320 | --- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.orig | ||
321 | +++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp | ||
322 | @@ -92,7 +92,7 @@ public: | ||
323 | regions_at_put(_curr_index, NULL); | ||
324 | assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes, | ||
325 | err_msg("remaining reclaimable bytes inconsistent " | ||
326 | - "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT, | ||
327 | + "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT, | ||
328 | hr->reclaimable_bytes(), _remaining_reclaimable_bytes)); | ||
329 | _remaining_reclaimable_bytes -= hr->reclaimable_bytes(); | ||
330 | _curr_index += 1; | ||
331 | --- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.orig | ||
332 | +++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp | ||
333 | @@ -284,7 +284,7 @@ void CMMarkStack::expand() { | ||
334 | if (PrintGCDetails && Verbose) { | ||
335 | // Failed to double capacity, continue; | ||
336 | gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from " | ||
337 | - SIZE_FORMAT"K to " SIZE_FORMAT"K", | ||
338 | + SIZE_FORMAT "K to " SIZE_FORMAT "K", | ||
339 | _capacity / K, new_capacity / K); | ||
340 | } | ||
341 | } | ||
342 | @@ -581,7 +581,7 @@ ConcurrentMark::ConcurrentMark(G1Collect | ||
343 | _verbose_level = verbose_level; | ||
344 | |||
345 | if (verbose_low()) { | ||
346 | - gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", " | ||
347 | + gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", " | ||
348 | "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end)); | ||
349 | } | ||
350 | |||
351 | @@ -837,7 +837,7 @@ void ConcurrentMark::set_concurrency_and | ||
352 | // in a STW phase. | ||
353 | assert(!concurrent_marking_in_progress(), "invariant"); | ||
354 | assert(out_of_regions(), | ||
355 | - err_msg("only way to get here: _finger: "PTR_FORMAT", _heap_end: "PTR_FORMAT, | ||
356 | + err_msg("only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT, | ||
357 | p2i(_finger), p2i(_heap_end))); | ||
358 | } | ||
359 | } | ||
360 | @@ -1452,7 +1452,7 @@ public: | ||
361 | |||
362 | assert(start <= hr->end() && start <= ntams && ntams <= hr->end(), | ||
363 | err_msg("Preconditions not met - " | ||
364 | - "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT, | ||
365 | + "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT, | ||
366 | p2i(start), p2i(ntams), p2i(hr->end()))); | ||
367 | |||
368 | // Find the first marked object at or after "start". | ||
369 | @@ -1769,10 +1769,10 @@ class FinalCountDataUpdateClosure: publi | ||
370 | } | ||
371 | |||
372 | assert(end_idx <= _card_bm->size(), | ||
373 | - err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, | ||
374 | + err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, | ||
375 | end_idx, _card_bm->size())); | ||
376 | assert(start_idx < _card_bm->size(), | ||
377 | - err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, | ||
378 | + err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, | ||
379 | start_idx, _card_bm->size())); | ||
380 | |||
381 | _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); | ||
382 | @@ -2277,7 +2277,7 @@ class G1CMKeepAliveAndDrainClosure: publ | ||
383 | oop obj = oopDesc::load_decode_heap_oop(p); | ||
384 | if (_cm->verbose_high()) { | ||
385 | gclog_or_tty->print_cr("\t[%u] we're looking at location " | ||
386 | - "*"PTR_FORMAT" = "PTR_FORMAT, | ||
387 | + "*" PTR_FORMAT " = " PTR_FORMAT, | ||
388 | _task->worker_id(), p2i(p), p2i((void*) obj)); | ||
389 | } | ||
390 | |||
391 | @@ -2846,7 +2846,7 @@ public: | ||
392 | } | ||
393 | } | ||
394 | |||
395 | - _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s", | ||
396 | + _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s", | ||
397 | p2i(p), p2i((void*) obj), str, str2); | ||
398 | } | ||
399 | }; | ||
400 | @@ -2873,7 +2873,7 @@ public: | ||
401 | bool print_it = _all || over_tams || marked; | ||
402 | |||
403 | if (print_it) { | ||
404 | - _out->print_cr(" "PTR_FORMAT"%s", | ||
405 | + _out->print_cr(" " PTR_FORMAT "%s", | ||
406 | p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : ""); | ||
407 | PrintReachableOopClosure oopCl(_out, _vo, _all); | ||
408 | o->oop_iterate_no_header(&oopCl); | ||
409 | @@ -2894,7 +2894,7 @@ public: | ||
410 | HeapWord* e = hr->end(); | ||
411 | HeapWord* t = hr->top(); | ||
412 | HeapWord* p = _g1h->top_at_mark_start(hr, _vo); | ||
413 | - _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" " | ||
414 | + _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " " | ||
415 | "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p)); | ||
416 | _out->cr(); | ||
417 | |||
418 | @@ -3018,9 +3018,9 @@ ConcurrentMark::claim_region(uint worker | ||
419 | HeapWord* limit = curr_region->next_top_at_mark_start(); | ||
420 | |||
421 | if (verbose_low()) { | ||
422 | - gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" " | ||
423 | - "["PTR_FORMAT", "PTR_FORMAT"), " | ||
424 | - "limit = "PTR_FORMAT, | ||
425 | + gclog_or_tty->print_cr("[%u] curr_region = " PTR_FORMAT " " | ||
426 | + "[" PTR_FORMAT ", " PTR_FORMAT "), " | ||
427 | + "limit = " PTR_FORMAT, | ||
428 | worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit)); | ||
429 | } | ||
430 | |||
431 | @@ -3035,7 +3035,7 @@ ConcurrentMark::claim_region(uint worker | ||
432 | |||
433 | if (limit > bottom) { | ||
434 | if (verbose_low()) { | ||
435 | - gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, " | ||
436 | + gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is not empty, " | ||
437 | "returning it ", worker_id, p2i(curr_region)); | ||
438 | } | ||
439 | return curr_region; | ||
440 | @@ -3043,7 +3043,7 @@ ConcurrentMark::claim_region(uint worker | ||
441 | assert(limit == bottom, | ||
442 | "the region limit should be at bottom"); | ||
443 | if (verbose_low()) { | ||
444 | - gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, " | ||
445 | + gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is empty, " | ||
446 | "returning NULL", worker_id, p2i(curr_region)); | ||
447 | } | ||
448 | // we return NULL and the caller should try calling | ||
449 | @@ -3055,13 +3055,13 @@ ConcurrentMark::claim_region(uint worker | ||
450 | if (verbose_low()) { | ||
451 | if (curr_region == NULL) { | ||
452 | gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, " | ||
453 | - "global finger = "PTR_FORMAT", " | ||
454 | - "our finger = "PTR_FORMAT, | ||
455 | + "global finger = " PTR_FORMAT ", " | ||
456 | + "our finger = " PTR_FORMAT, | ||
457 | worker_id, p2i(_finger), p2i(finger)); | ||
458 | } else { | ||
459 | gclog_or_tty->print_cr("[%u] somebody else moved the finger, " | ||
460 | - "global finger = "PTR_FORMAT", " | ||
461 | - "our finger = "PTR_FORMAT, | ||
462 | + "global finger = " PTR_FORMAT ", " | ||
463 | + "our finger = " PTR_FORMAT, | ||
464 | worker_id, p2i(_finger), p2i(finger)); | ||
465 | } | ||
466 | } | ||
467 | @@ -3097,7 +3097,7 @@ private: | ||
468 | |||
469 | void do_object_work(oop obj) { | ||
470 | guarantee(!_g1h->obj_in_cs(obj), | ||
471 | - err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d", | ||
472 | + err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d", | ||
473 | p2i((void*) obj), phase_str(), _info)); | ||
474 | } | ||
475 | |||
476 | @@ -3158,7 +3158,7 @@ void ConcurrentMark::verify_no_cset_oops | ||
477 | // here. | ||
478 | HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger); | ||
479 | guarantee(global_hr == NULL || global_finger == global_hr->bottom(), | ||
480 | - err_msg("global finger: "PTR_FORMAT" region: "HR_FORMAT, | ||
481 | + err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT, | ||
482 | p2i(global_finger), HR_FORMAT_PARAMS(global_hr))); | ||
483 | } | ||
484 | |||
485 | @@ -3172,7 +3172,7 @@ void ConcurrentMark::verify_no_cset_oops | ||
486 | HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger); | ||
487 | guarantee(task_hr == NULL || task_finger == task_hr->bottom() || | ||
488 | !task_hr->in_collection_set(), | ||
489 | - err_msg("task finger: "PTR_FORMAT" region: "HR_FORMAT, | ||
490 | + err_msg("task finger: " PTR_FORMAT " region: " HR_FORMAT, | ||
491 | p2i(task_finger), HR_FORMAT_PARAMS(task_hr))); | ||
492 | } | ||
493 | } | ||
494 | @@ -3214,8 +3214,8 @@ class AggregateCountDataHRClosure: publi | ||
495 | |||
496 | assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(), | ||
497 | err_msg("Preconditions not met - " | ||
498 | - "start: "PTR_FORMAT", limit: "PTR_FORMAT", " | ||
499 | - "top: "PTR_FORMAT", end: "PTR_FORMAT, | ||
500 | + "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", " | ||
501 | + "top: " PTR_FORMAT ", end: " PTR_FORMAT, | ||
502 | p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end()))); | ||
503 | |||
504 | assert(hr->next_marked_bytes() == 0, "Precondition"); | ||
505 | @@ -3494,7 +3494,7 @@ bool ConcurrentMark::do_yield_check(uint | ||
506 | #ifndef PRODUCT | ||
507 | // for debugging purposes | ||
508 | void ConcurrentMark::print_finger() { | ||
509 | - gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT, | ||
510 | + gclog_or_tty->print_cr("heap [" PTR_FORMAT ", " PTR_FORMAT "), global finger = " PTR_FORMAT, | ||
511 | p2i(_heap_start), p2i(_heap_end), p2i(_finger)); | ||
512 | for (uint i = 0; i < _max_worker_id; ++i) { | ||
513 | gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger())); | ||
514 | @@ -3579,7 +3579,7 @@ void CMTask::setup_for_region(HeapRegion | ||
515 | "claim_region() should have filtered out continues humongous regions"); | ||
516 | |||
517 | if (_cm->verbose_low()) { | ||
518 | - gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT, | ||
519 | + gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT, | ||
520 | _worker_id, p2i(hr)); | ||
521 | } | ||
522 | |||
523 | @@ -3596,7 +3596,7 @@ void CMTask::update_region_limit() { | ||
524 | if (limit == bottom) { | ||
525 | if (_cm->verbose_low()) { | ||
526 | gclog_or_tty->print_cr("[%u] found an empty region " | ||
527 | - "["PTR_FORMAT", "PTR_FORMAT")", | ||
528 | + "[" PTR_FORMAT ", " PTR_FORMAT ")", | ||
529 | _worker_id, p2i(bottom), p2i(limit)); | ||
530 | } | ||
531 | // The region was collected underneath our feet. | ||
532 | @@ -3628,7 +3628,7 @@ void CMTask::update_region_limit() { | ||
533 | void CMTask::giveup_current_region() { | ||
534 | assert(_curr_region != NULL, "invariant"); | ||
535 | if (_cm->verbose_low()) { | ||
536 | - gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT, | ||
537 | + gclog_or_tty->print_cr("[%u] giving up region " PTR_FORMAT, | ||
538 | _worker_id, p2i(_curr_region)); | ||
539 | } | ||
540 | clear_region_fields(); | ||
541 | @@ -3750,7 +3750,7 @@ void CMTask::regular_clock_call() { | ||
542 | |||
543 | if (_cm->verbose_medium()) { | ||
544 | gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, " | ||
545 | - "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s", | ||
546 | + "scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s", | ||
547 | _worker_id, last_interval_ms, | ||
548 | _words_scanned, | ||
549 | (_words_scanned >= _words_scanned_limit) ? " (*)" : "", | ||
550 | @@ -3919,7 +3919,7 @@ void CMTask::drain_local_queue(bool part | ||
551 | statsOnly( ++_local_pops ); | ||
552 | |||
553 | if (_cm->verbose_high()) { | ||
554 | - gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id, | ||
555 | + gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id, | ||
556 | p2i((void*) obj)); | ||
557 | } | ||
558 | |||
559 | @@ -4272,8 +4272,8 @@ void CMTask::do_marking_step(double time | ||
560 | |||
561 | if (_cm->verbose_low()) { | ||
562 | gclog_or_tty->print_cr("[%u] we're scanning part " | ||
563 | - "["PTR_FORMAT", "PTR_FORMAT") " | ||
564 | - "of region "HR_FORMAT, | ||
565 | + "[" PTR_FORMAT ", " PTR_FORMAT ") " | ||
566 | + "of region " HR_FORMAT, | ||
567 | _worker_id, p2i(_finger), p2i(_region_limit), | ||
568 | HR_FORMAT_PARAMS(_curr_region)); | ||
569 | } | ||
570 | @@ -4360,7 +4360,7 @@ void CMTask::do_marking_step(double time | ||
571 | |||
572 | if (_cm->verbose_low()) { | ||
573 | gclog_or_tty->print_cr("[%u] we successfully claimed " | ||
574 | - "region "PTR_FORMAT, | ||
575 | + "region " PTR_FORMAT, | ||
576 | _worker_id, p2i(claimed_region)); | ||
577 | } | ||
578 | |||
579 | @@ -4421,7 +4421,7 @@ void CMTask::do_marking_step(double time | ||
580 | |||
581 | if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) { | ||
582 | if (_cm->verbose_medium()) { | ||
583 | - gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully", | ||
584 | + gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully", | ||
585 | _worker_id, p2i((void*) obj)); | ||
586 | } | ||
587 | |||
588 | @@ -4629,7 +4629,7 @@ CMTask::CMTask(uint worker_id, | ||
589 | // identify them easily in a large log file. | ||
590 | #define G1PPRL_LINE_PREFIX "###" | ||
591 | |||
592 | -#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT | ||
593 | +#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT | ||
594 | #ifdef _LP64 | ||
595 | #define G1PPRL_ADDR_BASE_H_FORMAT " %37s" | ||
596 | #else // _LP64 | ||
597 | @@ -4639,16 +4639,16 @@ CMTask::CMTask(uint worker_id, | ||
598 | // For per-region info | ||
599 | #define G1PPRL_TYPE_FORMAT " %-4s" | ||
600 | #define G1PPRL_TYPE_H_FORMAT " %4s" | ||
601 | -#define G1PPRL_BYTE_FORMAT " "SIZE_FORMAT_W(9) | ||
602 | +#define G1PPRL_BYTE_FORMAT " " SIZE_FORMAT_W(9) | ||
603 | #define G1PPRL_BYTE_H_FORMAT " %9s" | ||
604 | #define G1PPRL_DOUBLE_FORMAT " %14.1f" | ||
605 | #define G1PPRL_DOUBLE_H_FORMAT " %14s" | ||
606 | |||
607 | // For summary info | ||
608 | -#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT | ||
609 | -#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT | ||
610 | -#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB" | ||
611 | -#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%" | ||
612 | +#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":" G1PPRL_ADDR_BASE_FORMAT | ||
613 | +#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT | ||
614 | +#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB" | ||
615 | +#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%" | ||
616 | |||
617 | G1PrintRegionLivenessInfoClosure:: | ||
618 | G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name) | ||
619 | --- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.orig | ||
620 | +++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp | ||
621 | @@ -196,8 +196,8 @@ inline bool CMBitMapRO::iterate(BitMapCl | ||
622 | assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \ | ||
623 | "outside underlying space?"); \ | ||
624 | assert(G1CollectedHeap::heap()->is_in_exact(addr), \ | ||
625 | - err_msg("Trying to access not available bitmap "PTR_FORMAT \ | ||
626 | - " corresponding to "PTR_FORMAT" (%u)", \ | ||
627 | + err_msg("Trying to access not available bitmap " PTR_FORMAT \ | ||
628 | + " corresponding to " PTR_FORMAT " (%u)", \ | ||
629 | p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr))); | ||
630 | |||
631 | inline void CMBitMap::mark(HeapWord* addr) { | ||
632 | @@ -343,7 +343,7 @@ inline void CMTask::make_reference_grey( | ||
633 | |||
634 | inline void CMTask::deal_with_reference(oop obj) { | ||
635 | if (_cm->verbose_high()) { | ||
636 | - gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT, | ||
637 | + gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT, | ||
638 | _worker_id, p2i((void*) obj)); | ||
639 | } | ||
640 | |||
641 | @@ -392,7 +392,7 @@ inline void ConcurrentMark::grayRoot(oop | ||
642 | // assert that word_size is under an upper bound which is its | ||
643 | // containing region's capacity. | ||
644 | assert(word_size * HeapWordSize <= hr->capacity(), | ||
645 | - err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT, | ||
646 | + err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT, | ||
647 | word_size * HeapWordSize, hr->capacity(), | ||
648 | HR_FORMAT_PARAMS(hr))); | ||
649 | |||
650 | --- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.orig | ||
651 | +++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp | ||
652 | @@ -140,7 +140,7 @@ HeapWord* G1AllocRegion::new_alloc_regio | ||
653 | } | ||
654 | |||
655 | void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) { | ||
656 | - msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT, | ||
657 | + msg->append("[%s] %s c: %u b: %s r: " PTR_FORMAT " u: " SIZE_FORMAT, | ||
658 | _name, message, _count, BOOL_TO_STR(_bot_updates), | ||
659 | p2i(_alloc_region), _used_bytes_before); | ||
660 | } | ||
661 | @@ -217,7 +217,7 @@ void G1AllocRegion::trace(const char* st | ||
662 | |||
663 | if (G1_ALLOC_REGION_TRACING > 1) { | ||
664 | if (result != NULL) { | ||
665 | - jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT" "PTR_FORMAT, | ||
666 | + jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT " " PTR_FORMAT, | ||
667 | word_size, result); | ||
668 | } else if (word_size != 0) { | ||
669 | jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size); | ||
670 | --- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp.orig | ||
671 | +++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp | ||
672 | @@ -73,7 +73,7 @@ public: | ||
673 | |||
674 | void decrease_used(size_t bytes) { | ||
675 | assert(_summary_bytes_used >= bytes, | ||
676 | - err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT, | ||
677 | + err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT, | ||
678 | _summary_bytes_used, bytes)); | ||
679 | _summary_bytes_used -= bytes; | ||
680 | } | ||
681 | --- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.orig | ||
682 | +++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp | ||
683 | @@ -385,11 +385,11 @@ G1BlockOffsetArray::verify_for_object(He | ||
684 | HeapWord* card_addr = _array->address_for_index(card); | ||
685 | HeapWord* block_start = block_start_const(card_addr); | ||
686 | if (block_start != obj_start) { | ||
687 | - gclog_or_tty->print_cr("block start: "PTR_FORMAT" is incorrect - " | ||
688 | - "card index: "SIZE_FORMAT" " | ||
689 | - "card addr: "PTR_FORMAT" BOT entry: %u " | ||
690 | - "obj: "PTR_FORMAT" word size: "SIZE_FORMAT" " | ||
691 | - "cards: ["SIZE_FORMAT","SIZE_FORMAT"]", | ||
692 | + gclog_or_tty->print_cr("block start: " PTR_FORMAT " is incorrect - " | ||
693 | + "card index: " SIZE_FORMAT " " | ||
694 | + "card addr: " PTR_FORMAT " BOT entry: %u " | ||
695 | + "obj: " PTR_FORMAT " word size: " SIZE_FORMAT " " | ||
696 | + "cards: [" SIZE_FORMAT "," SIZE_FORMAT "]", | ||
697 | block_start, card, card_addr, | ||
698 | _array->offset_array(card), | ||
699 | obj_start, word_size, first_card, last_card); | ||
700 | @@ -404,11 +404,11 @@ void | ||
701 | G1BlockOffsetArray::print_on(outputStream* out) { | ||
702 | size_t from_index = _array->index_for(_bottom); | ||
703 | size_t to_index = _array->index_for(_end); | ||
704 | - out->print_cr(">> BOT for area ["PTR_FORMAT","PTR_FORMAT") " | ||
705 | - "cards ["SIZE_FORMAT","SIZE_FORMAT")", | ||
706 | + out->print_cr(">> BOT for area [" PTR_FORMAT "," PTR_FORMAT ") " | ||
707 | + "cards [" SIZE_FORMAT "," SIZE_FORMAT ")", | ||
708 | _bottom, _end, from_index, to_index); | ||
709 | for (size_t i = from_index; i < to_index; ++i) { | ||
710 | - out->print_cr(" entry "SIZE_FORMAT_W(8)" | "PTR_FORMAT" : %3u", | ||
711 | + out->print_cr(" entry " SIZE_FORMAT_W(8) " | " PTR_FORMAT " : %3u", | ||
712 | i, _array->address_for_index(i), | ||
713 | (uint) _array->offset_array(i)); | ||
714 | } | ||
715 | @@ -488,7 +488,7 @@ G1BlockOffsetArrayContigSpace::set_for_s | ||
716 | void | ||
717 | G1BlockOffsetArrayContigSpace::print_on(outputStream* out) { | ||
718 | G1BlockOffsetArray::print_on(out); | ||
719 | - out->print_cr(" next offset threshold: "PTR_FORMAT, _next_offset_threshold); | ||
720 | - out->print_cr(" next offset index: "SIZE_FORMAT, _next_offset_index); | ||
721 | + out->print_cr(" next offset threshold: " PTR_FORMAT, _next_offset_threshold); | ||
722 | + out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index); | ||
723 | } | ||
724 | #endif // !PRODUCT | ||
725 | --- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.orig | ||
726 | +++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp | ||
727 | @@ -47,15 +47,15 @@ G1BlockOffsetTable::block_start_const(co | ||
728 | } | ||
729 | } | ||
730 | |||
731 | -#define check_index(index, msg) \ | ||
732 | - assert((index) < (_reserved.word_size() >> LogN_words), \ | ||
733 | - err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \ | ||
734 | - msg, (index), (_reserved.word_size() >> LogN_words))); \ | ||
735 | - assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \ | ||
736 | - err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \ | ||
737 | - " (%u) is not in committed area.", \ | ||
738 | - (index), \ | ||
739 | - p2i(address_for_index_raw(index)), \ | ||
740 | +#define check_index(index, msg) \ | ||
741 | + assert((index) < (_reserved.word_size() >> LogN_words), \ | ||
742 | + err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \ | ||
743 | + msg, (index), (_reserved.word_size() >> LogN_words))); \ | ||
744 | + assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \ | ||
745 | + err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \ | ||
746 | + " (%u) is not in committed area.", \ | ||
747 | + (index), \ | ||
748 | + p2i(address_for_index_raw(index)), \ | ||
749 | G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index)))); | ||
750 | |||
751 | u_char G1BlockOffsetSharedArray::offset_array(size_t index) const { | ||
752 | --- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp.orig | ||
753 | +++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp | ||
754 | @@ -44,7 +44,7 @@ void G1CardCountsMappingChangedListener: | ||
755 | void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { | ||
756 | if (has_count_table()) { | ||
757 | assert(from_card_num < to_card_num, | ||
758 | - err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT, | ||
759 | + err_msg("Wrong order? from: " SIZE_FORMAT ", to: " SIZE_FORMAT, | ||
760 | from_card_num, to_card_num)); | ||
761 | Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num)); | ||
762 | } | ||
763 | @@ -87,7 +87,7 @@ uint G1CardCounts::add_card_count(jbyte* | ||
764 | if (has_count_table()) { | ||
765 | size_t card_num = ptr_2_card_num(card_ptr); | ||
766 | assert(card_num < _reserved_max_card_num, | ||
767 | - err_msg("Card "SIZE_FORMAT" outside of card counts table (max size "SIZE_FORMAT")", | ||
768 | + err_msg("Card " SIZE_FORMAT " outside of card counts table (max size " SIZE_FORMAT ")", | ||
769 | card_num, _reserved_max_card_num)); | ||
770 | count = (uint) _card_counts[card_num]; | ||
771 | if (count < G1ConcRSHotCardLimit) { | ||
772 | --- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp.orig | ||
773 | +++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp | ||
774 | @@ -91,7 +91,7 @@ class G1CardCounts: public CHeapObj<mtGC | ||
775 | |||
776 | jbyte* card_num_2_ptr(size_t card_num) { | ||
777 | assert(card_num >= 0 && card_num < _reserved_max_card_num, | ||
778 | - err_msg("card num out of range: "SIZE_FORMAT, card_num)); | ||
779 | + err_msg("card num out of range: " SIZE_FORMAT, card_num)); | ||
780 | return (jbyte*) (_ct_bot + card_num); | ||
781 | } | ||
782 | |||
783 | --- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.orig | ||
784 | +++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | ||
785 | @@ -230,7 +230,7 @@ bool YoungList::check_list_well_formed() | ||
786 | HeapRegion* last = NULL; | ||
787 | while (curr != NULL) { | ||
788 | if (!curr->is_young()) { | ||
789 | - gclog_or_tty->print_cr("### YOUNG REGION "PTR_FORMAT"-"PTR_FORMAT" " | ||
790 | + gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " " | ||
791 | "incorrectly tagged (y: %d, surv: %d)", | ||
792 | curr->bottom(), curr->end(), | ||
793 | curr->is_young(), curr->is_survivor()); | ||
794 | @@ -359,7 +359,7 @@ void YoungList::print() { | ||
795 | if (curr == NULL) | ||
796 | gclog_or_tty->print_cr(" empty"); | ||
797 | while (curr != NULL) { | ||
798 | - gclog_or_tty->print_cr(" "HR_FORMAT", P: "PTR_FORMAT ", N: "PTR_FORMAT", age: %4d", | ||
799 | + gclog_or_tty->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d", | ||
800 | HR_FORMAT_PARAMS(curr), | ||
801 | curr->prev_top_at_mark_start(), | ||
802 | curr->next_top_at_mark_start(), | ||
803 | @@ -490,7 +490,7 @@ void G1CollectedHeap::check_ct_logs_at_s | ||
804 | gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.", | ||
805 | clear.num_processed(), orig_count); | ||
806 | guarantee(redirty.num_processed() == clear.num_processed(), | ||
807 | - err_msg("Redirtied "SIZE_FORMAT" cards, bug cleared "SIZE_FORMAT, | ||
808 | + err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT, | ||
809 | redirty.num_processed(), clear.num_processed())); | ||
810 | |||
811 | CountNonCleanMemRegionClosure count3(this); | ||
812 | @@ -528,7 +528,7 @@ G1CollectedHeap::new_region_try_secondar | ||
813 | HeapRegion* res = _hrm.allocate_free_region(is_old); | ||
814 | if (G1ConcRegionFreeingVerbose) { | ||
815 | gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : " | ||
816 | - "allocated "HR_FORMAT" from secondary_free_list", | ||
817 | + "allocated " HR_FORMAT " from secondary_free_list", | ||
818 | HR_FORMAT_PARAMS(res)); | ||
819 | } | ||
820 | return res; | ||
821 | @@ -1597,8 +1597,8 @@ resize_if_necessary_after_full_collectio | ||
822 | // This assert only makes sense here, before we adjust them | ||
823 | // with respect to the min and max heap size. | ||
824 | assert(minimum_desired_capacity <= maximum_desired_capacity, | ||
825 | - err_msg("minimum_desired_capacity = "SIZE_FORMAT", " | ||
826 | - "maximum_desired_capacity = "SIZE_FORMAT, | ||
827 | + err_msg("minimum_desired_capacity = " SIZE_FORMAT ", " | ||
828 | + "maximum_desired_capacity = " SIZE_FORMAT, | ||
829 | minimum_desired_capacity, maximum_desired_capacity)); | ||
830 | |||
831 | // Should not be greater than the heap max size. No need to adjust | ||
832 | @@ -2256,7 +2256,7 @@ public: | ||
833 | virtual bool doHeapRegion(HeapRegion* hr) { | ||
834 | unsigned region_gc_time_stamp = hr->get_gc_time_stamp(); | ||
835 | if (_gc_time_stamp != region_gc_time_stamp) { | ||
836 | - gclog_or_tty->print_cr("Region "HR_FORMAT" has GC time stamp = %d, " | ||
837 | + gclog_or_tty->print_cr("Region " HR_FORMAT " has GC time stamp = %d, " | ||
838 | "expected %d", HR_FORMAT_PARAMS(hr), | ||
839 | region_gc_time_stamp, _gc_time_stamp); | ||
840 | _failures = true; | ||
841 | @@ -2679,7 +2679,7 @@ public: | ||
842 | } else if (r->continuesHumongous()) { | ||
843 | if (r->humongous_start_region() != _sh_region) { | ||
844 | gclog_or_tty->print_cr("Region " HR_FORMAT ", " | ||
845 | - "HS = "PTR_FORMAT", should be "PTR_FORMAT, | ||
846 | + "HS = " PTR_FORMAT ", should be " PTR_FORMAT, | ||
847 | HR_FORMAT_PARAMS(r), | ||
848 | r->humongous_start_region(), | ||
849 | _sh_region); | ||
850 | @@ -2991,10 +2991,10 @@ public: | ||
851 | if (!oopDesc::is_null(heap_oop)) { | ||
852 | oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); | ||
853 | if (_g1h->is_obj_dead_cond(obj, _vo)) { | ||
854 | - gclog_or_tty->print_cr("Root location "PTR_FORMAT" " | ||
855 | - "points to dead obj "PTR_FORMAT, p, (void*) obj); | ||
856 | + gclog_or_tty->print_cr("Root location " PTR_FORMAT " " | ||
857 | + "points to dead obj " PTR_FORMAT, p, (void*) obj); | ||
858 | if (_vo == VerifyOption_G1UseMarkWord) { | ||
859 | - gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark())); | ||
860 | + gclog_or_tty->print_cr(" Mark word: " PTR_FORMAT, (void*)(obj->mark())); | ||
861 | } | ||
862 | obj->print_on(gclog_or_tty); | ||
863 | _failures = true; | ||
864 | @@ -3041,9 +3041,9 @@ class G1VerifyCodeRootOopClosure: public | ||
865 | // Verify that the strong code root list for this region | ||
866 | // contains the nmethod | ||
867 | if (!hrrs->strong_code_roots_list_contains(_nm)) { | ||
868 | - gclog_or_tty->print_cr("Code root location "PTR_FORMAT" " | ||
869 | - "from nmethod "PTR_FORMAT" not in strong " | ||
870 | - "code roots for region ["PTR_FORMAT","PTR_FORMAT")", | ||
871 | + gclog_or_tty->print_cr("Code root location " PTR_FORMAT " " | ||
872 | + "from nmethod " PTR_FORMAT " not in strong " | ||
873 | + "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")", | ||
874 | p, _nm, hr->bottom(), hr->end()); | ||
875 | _failures = true; | ||
876 | } | ||
877 | @@ -3173,7 +3173,7 @@ public: | ||
878 | if (o != NULL) { | ||
879 | HeapWord *start = (HeapWord *) o; | ||
880 | size_t word_sz = o->size(); | ||
881 | - gclog_or_tty->print("\nPrinting obj "PTR_FORMAT" of size " SIZE_FORMAT | ||
882 | + gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT | ||
883 | " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n", | ||
884 | (void*) o, word_sz, | ||
885 | _g1->isMarkedPrev(o), | ||
886 | @@ -3184,7 +3184,7 @@ public: | ||
887 | int *val; | ||
888 | for (cur = start; cur < end; cur++) { | ||
889 | val = (int *) cur; | ||
890 | - gclog_or_tty->print("\t "PTR_FORMAT":"PTR_FORMAT"\n", val, *val); | ||
891 | + gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val); | ||
892 | } | ||
893 | } | ||
894 | } | ||
895 | @@ -3219,9 +3219,9 @@ public: | ||
896 | r->object_iterate(¬_dead_yet_cl); | ||
897 | if (_vo != VerifyOption_G1UseNextMarking) { | ||
898 | if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) { | ||
899 | - gclog_or_tty->print_cr("["PTR_FORMAT","PTR_FORMAT"] " | ||
900 | - "max_live_bytes "SIZE_FORMAT" " | ||
901 | - "< calculated "SIZE_FORMAT, | ||
902 | + gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] " | ||
903 | + "max_live_bytes " SIZE_FORMAT " " | ||
904 | + "< calculated " SIZE_FORMAT, | ||
905 | r->bottom(), r->end(), | ||
906 | r->max_live_bytes(), | ||
907 | not_dead_yet_cl.live_bytes()); | ||
908 | @@ -3533,7 +3533,7 @@ public: | ||
909 | size_t occupied = hrrs->occupied(); | ||
910 | _occupied_sum += occupied; | ||
911 | |||
912 | - gclog_or_tty->print_cr("Printing RSet for region "HR_FORMAT, | ||
913 | + gclog_or_tty->print_cr("Printing RSet for region " HR_FORMAT, | ||
914 | HR_FORMAT_PARAMS(r)); | ||
915 | if (occupied == 0) { | ||
916 | gclog_or_tty->print_cr(" RSet is empty"); | ||
917 | @@ -3552,7 +3552,7 @@ public: | ||
918 | } | ||
919 | |||
920 | ~PrintRSetsClosure() { | ||
921 | - gclog_or_tty->print_cr("Occupied Sum: "SIZE_FORMAT, _occupied_sum); | ||
922 | + gclog_or_tty->print_cr("Occupied Sum: " SIZE_FORMAT, _occupied_sum); | ||
923 | gclog_or_tty->print_cr("========================================"); | ||
924 | gclog_or_tty->cr(); | ||
925 | } | ||
926 | @@ -4416,7 +4416,7 @@ oop | ||
927 | G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state, | ||
928 | oop old) { | ||
929 | assert(obj_in_cs(old), | ||
930 | - err_msg("obj: "PTR_FORMAT" should still be in the CSet", | ||
931 | + err_msg("obj: " PTR_FORMAT " should still be in the CSet", | ||
932 | (HeapWord*) old)); | ||
933 | markOop m = old->mark(); | ||
934 | oop forward_ptr = old->forward_to_atomic(old); | ||
935 | @@ -4450,7 +4450,7 @@ G1CollectedHeap::handle_evacuation_failu | ||
936 | // space for this object (old != forward_ptr) or they beat us in | ||
937 | // self-forwarding it (old == forward_ptr). | ||
938 | assert(old == forward_ptr || !obj_in_cs(forward_ptr), | ||
939 | - err_msg("obj: "PTR_FORMAT" forwarded to: "PTR_FORMAT" " | ||
940 | + err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " " | ||
941 | "should not be in the CSet", | ||
942 | (HeapWord*) old, (HeapWord*) forward_ptr)); | ||
943 | return forward_ptr; | ||
944 | @@ -4837,16 +4837,16 @@ public: | ||
945 | |||
946 | ~G1StringSymbolTableUnlinkTask() { | ||
947 | guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size, | ||
948 | - err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT, | ||
949 | + err_msg("claim value " INT32_FORMAT " after unlink less than initial string table size " INT32_FORMAT, | ||
950 | StringTable::parallel_claimed_index(), _initial_string_table_size)); | ||
951 | guarantee(!_process_symbols || !_do_in_parallel || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size, | ||
952 | - err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT, | ||
953 | + err_msg("claim value " INT32_FORMAT " after unlink less than initial symbol table size " INT32_FORMAT, | ||
954 | SymbolTable::parallel_claimed_index(), _initial_symbol_table_size)); | ||
955 | |||
956 | if (G1TraceStringSymbolTableScrubbing) { | ||
957 | gclog_or_tty->print_cr("Cleaned string and symbol table, " | ||
958 | - "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, " | ||
959 | - "symbols: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed", | ||
960 | + "strings: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed, " | ||
961 | + "symbols: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed", | ||
962 | strings_processed(), strings_removed(), | ||
963 | symbols_processed(), symbols_removed()); | ||
964 | } | ||
965 | @@ -6029,13 +6029,13 @@ void G1CollectedHeap::verify_dirty_young | ||
966 | bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap, | ||
967 | HeapWord* tams, HeapWord* end) { | ||
968 | guarantee(tams <= end, | ||
969 | - err_msg("tams: "PTR_FORMAT" end: "PTR_FORMAT, tams, end)); | ||
970 | + err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end)); | ||
971 | HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end); | ||
972 | if (result < end) { | ||
973 | gclog_or_tty->cr(); | ||
974 | - gclog_or_tty->print_cr("## wrong marked address on %s bitmap: "PTR_FORMAT, | ||
975 | + gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT, | ||
976 | bitmap_name, result); | ||
977 | - gclog_or_tty->print_cr("## %s tams: "PTR_FORMAT" end: "PTR_FORMAT, | ||
978 | + gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT, | ||
979 | bitmap_name, tams, end); | ||
980 | return false; | ||
981 | } | ||
982 | @@ -6061,7 +6061,7 @@ bool G1CollectedHeap::verify_bitmaps(con | ||
983 | res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end); | ||
984 | } | ||
985 | if (!res_p || !res_n) { | ||
986 | - gclog_or_tty->print_cr("#### Bitmap verification failed for "HR_FORMAT, | ||
987 | + gclog_or_tty->print_cr("#### Bitmap verification failed for " HR_FORMAT, | ||
988 | HR_FORMAT_PARAMS(hr)); | ||
989 | gclog_or_tty->print_cr("#### Caller: %s", caller); | ||
990 | return false; | ||
991 | @@ -6373,7 +6373,7 @@ class G1FreeHumongousRegionClosure : pub | ||
992 | !r->rem_set()->is_empty()) { | ||
993 | |||
994 | if (G1TraceEagerReclaimHumongousObjects) { | ||
995 | - gclog_or_tty->print_cr("Live humongous region %u size "SIZE_FORMAT" start "PTR_FORMAT" length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d reclaim candidate %d type array %d", | ||
996 | + gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d", | ||
997 | region_idx, | ||
998 | obj->size()*HeapWordSize, | ||
999 | r->bottom(), | ||
1000 | @@ -6395,7 +6395,7 @@ class G1FreeHumongousRegionClosure : pub | ||
1001 | r->bottom())); | ||
1002 | |||
1003 | if (G1TraceEagerReclaimHumongousObjects) { | ||
1004 | - gclog_or_tty->print_cr("Dead humongous region %u size "SIZE_FORMAT" start "PTR_FORMAT" length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d reclaim candidate %d type array %d", | ||
1005 | + gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d", | ||
1006 | region_idx, | ||
1007 | obj->size()*HeapWordSize, | ||
1008 | r->bottom(), | ||
1009 | @@ -6551,7 +6551,7 @@ public: | ||
1010 | NoYoungRegionsClosure() : _success(true) { } | ||
1011 | bool doHeapRegion(HeapRegion* r) { | ||
1012 | if (r->is_young()) { | ||
1013 | - gclog_or_tty->print_cr("Region ["PTR_FORMAT", "PTR_FORMAT") tagged as young", | ||
1014 | + gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young", | ||
1015 | r->bottom(), r->end()); | ||
1016 | _success = false; | ||
1017 | } | ||
1018 | @@ -6680,7 +6680,7 @@ void G1CollectedHeap::rebuild_region_set | ||
1019 | } | ||
1020 | assert(_allocator->used_unlocked() == recalculate_used(), | ||
1021 | err_msg("inconsistent _allocator->used_unlocked(), " | ||
1022 | - "value: "SIZE_FORMAT" recalculated: "SIZE_FORMAT, | ||
1023 | + "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT, | ||
1024 | _allocator->used_unlocked(), recalculate_used())); | ||
1025 | } | ||
1026 | |||
1027 | @@ -6901,8 +6901,8 @@ class RegisterNMethodOopClosure: public | ||
1028 | oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); | ||
1029 | HeapRegion* hr = _g1h->heap_region_containing(obj); | ||
1030 | assert(!hr->continuesHumongous(), | ||
1031 | - err_msg("trying to add code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT | ||
1032 | - " starting at "HR_FORMAT, | ||
1033 | + err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT | ||
1034 | + " starting at " HR_FORMAT, | ||
1035 | _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); | ||
1036 | |||
1037 | // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries. | ||
1038 | @@ -6928,8 +6928,8 @@ class UnregisterNMethodOopClosure: publi | ||
1039 | oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); | ||
1040 | HeapRegion* hr = _g1h->heap_region_containing(obj); | ||
1041 | assert(!hr->continuesHumongous(), | ||
1042 | - err_msg("trying to remove code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT | ||
1043 | - " starting at "HR_FORMAT, | ||
1044 | + err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT | ||
1045 | + " starting at " HR_FORMAT, | ||
1046 | _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); | ||
1047 | |||
1048 | hr->remove_strong_code_root(_nm); | ||
1049 | --- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.orig | ||
1050 | +++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp | ||
1051 | @@ -81,7 +81,7 @@ inline HeapRegion* G1CollectedHeap::regi | ||
1052 | |||
1053 | inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const { | ||
1054 | assert(is_in_reserved(addr), | ||
1055 | - err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")", | ||
1056 | + err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")", | ||
1057 | p2i(addr), p2i(_reserved.start()), p2i(_reserved.end()))); | ||
1058 | return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes); | ||
1059 | } | ||
1060 | @@ -94,7 +94,7 @@ template <class T> | ||
1061 | inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const { | ||
1062 | assert(addr != NULL, "invariant"); | ||
1063 | assert(is_in_g1_reserved((const void*) addr), | ||
1064 | - err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")", | ||
1065 | + err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")", | ||
1066 | p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end()))); | ||
1067 | return _hrm.addr_to_region((HeapWord*) addr); | ||
1068 | } | ||
1069 | --- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.orig | ||
1070 | +++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp | ||
1071 | @@ -199,7 +199,7 @@ G1CollectorPolicy::G1CollectorPolicy() : | ||
1072 | const size_t region_size = HeapRegion::GrainWords; | ||
1073 | if (YoungPLABSize > region_size || OldPLABSize > region_size) { | ||
1074 | char buffer[128]; | ||
1075 | - jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT, | ||
1076 | + jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT, | ||
1077 | OldPLABSize > region_size ? "Old" : "Young", region_size); | ||
1078 | vm_exit_during_initialization(buffer); | ||
1079 | } | ||
1080 | @@ -846,7 +846,7 @@ void G1CollectorPolicy::record_collectio | ||
1081 | update_survivors_policy(); | ||
1082 | |||
1083 | assert(_g1->used() == _g1->recalculate_used(), | ||
1084 | - err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT, | ||
1085 | + err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT, | ||
1086 | _g1->used(), _g1->recalculate_used())); | ||
1087 | |||
1088 | double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0; | ||
1089 | @@ -1231,10 +1231,10 @@ void G1CollectorPolicy::print_detailed_h | ||
1090 | (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc; | ||
1091 | |||
1092 | gclog_or_tty->print( | ||
1093 | - " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") " | ||
1094 | - "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" " | ||
1095 | - "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->" | ||
1096 | - EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]", | ||
1097 | + " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") " | ||
1098 | + "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " " | ||
1099 | + "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" | ||
1100 | + EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]", | ||
1101 | EXT_SIZE_PARAMS(_eden_used_bytes_before_gc), | ||
1102 | EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc), | ||
1103 | EXT_SIZE_PARAMS(eden_used_bytes_after_gc), | ||
1104 | @@ -1851,7 +1851,7 @@ void G1CollectorPolicy::print_collection | ||
1105 | while (csr != NULL) { | ||
1106 | HeapRegion* next = csr->next_in_collection_set(); | ||
1107 | assert(csr->in_collection_set(), "bad CS"); | ||
1108 | - st->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d", | ||
1109 | + st->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d", | ||
1110 | HR_FORMAT_PARAMS(csr), | ||
1111 | csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(), | ||
1112 | csr->age_in_surv_rate_group_cond()); | ||
1113 | --- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp.orig | ||
1114 | +++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp | ||
1115 | @@ -121,15 +121,15 @@ public: | ||
1116 | // Single parameter format strings | ||
1117 | #define ergo_format_str(_name_) ", " _name_ ": %s" | ||
1118 | #define ergo_format_region(_name_) ", " _name_ ": %u regions" | ||
1119 | -#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes" | ||
1120 | +#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes" | ||
1121 | #define ergo_format_double(_name_) ", " _name_ ": %1.2f" | ||
1122 | #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%" | ||
1123 | #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms" | ||
1124 | -#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT | ||
1125 | +#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT | ||
1126 | |||
1127 | // Double parameter format strings | ||
1128 | #define ergo_format_byte_perc(_name_) \ | ||
1129 | - ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)" | ||
1130 | + ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)" | ||
1131 | |||
1132 | // Generates the format string | ||
1133 | #define ergo_format(_extra_format_) \ | ||
1134 | --- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp.orig | ||
1135 | +++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp | ||
1136 | @@ -332,7 +332,7 @@ void G1GCPhaseTimes::print_stats(int lev | ||
1137 | } | ||
1138 | |||
1139 | void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) { | ||
1140 | - LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value); | ||
1141 | + LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value); | ||
1142 | } | ||
1143 | |||
1144 | void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) { | ||
1145 | @@ -452,7 +452,7 @@ class G1GCParPhasePrinter : public Stack | ||
1146 | |||
1147 | if (phase->_thread_work_items != NULL) { | ||
1148 | LineBuffer buf2(phase->_thread_work_items->_indent_level); | ||
1149 | - buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); | ||
1150 | + buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); | ||
1151 | } | ||
1152 | } | ||
1153 | |||
1154 | --- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.orig | ||
1155 | +++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp | ||
1156 | @@ -84,18 +84,18 @@ void G1HRPrinter::print(ActionType actio | ||
1157 | |||
1158 | if (type_str != NULL) { | ||
1159 | if (top != NULL) { | ||
1160 | - gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT, | ||
1161 | + gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT, | ||
1162 | action_str, type_str, bottom, top); | ||
1163 | } else { | ||
1164 | - gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT, | ||
1165 | + gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT, | ||
1166 | action_str, type_str, bottom); | ||
1167 | } | ||
1168 | } else { | ||
1169 | if (top != NULL) { | ||
1170 | - gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT, | ||
1171 | + gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT, | ||
1172 | action_str, bottom, top); | ||
1173 | } else { | ||
1174 | - gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT, | ||
1175 | + gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT, | ||
1176 | action_str, bottom); | ||
1177 | } | ||
1178 | } | ||
1179 | @@ -104,11 +104,11 @@ void G1HRPrinter::print(ActionType actio | ||
1180 | void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) { | ||
1181 | const char* action_str = action_name(action); | ||
1182 | |||
1183 | - gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]", | ||
1184 | + gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]", | ||
1185 | action_str, bottom, end); | ||
1186 | } | ||
1187 | |||
1188 | void G1HRPrinter::print(PhaseType phase, size_t phase_num) { | ||
1189 | const char* phase_str = phase_name(phase); | ||
1190 | - gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num); | ||
1191 | + gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num); | ||
1192 | } | ||
1193 | --- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.orig | ||
1194 | +++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp | ||
1195 | @@ -118,7 +118,7 @@ inline void G1CMOopClosure::do_oop_nv(T* | ||
1196 | oop obj = oopDesc::load_decode_heap_oop(p); | ||
1197 | if (_cm->verbose_high()) { | ||
1198 | gclog_or_tty->print_cr("[%u] we're looking at location " | ||
1199 | - "*"PTR_FORMAT" = "PTR_FORMAT, | ||
1200 | + "*" PTR_FORMAT " = " PTR_FORMAT, | ||
1201 | _task->worker_id(), p2i(p), p2i((void*) obj)); | ||
1202 | } | ||
1203 | _task->deal_with_reference(obj); | ||
1204 | --- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp.orig | ||
1205 | +++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp | ||
1206 | @@ -442,7 +442,7 @@ G1UpdateRSOrPushRefOopClosure(G1Collecte | ||
1207 | bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i, | ||
1208 | bool check_for_refs_into_cset) { | ||
1209 | assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)), | ||
1210 | - err_msg("Card at "PTR_FORMAT" index "SIZE_FORMAT" representing heap at "PTR_FORMAT" (%u) must be in committed heap", | ||
1211 | + err_msg("Card at " PTR_FORMAT " index " SIZE_FORMAT " representing heap at " PTR_FORMAT " (%u) must be in committed heap", | ||
1212 | p2i(card_ptr), | ||
1213 | _ct_bs->index_for(_ct_bs->addr_for(card_ptr)), | ||
1214 | _ct_bs->addr_for(card_ptr), | ||
1215 | --- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp.orig | ||
1216 | +++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp | ||
1217 | @@ -344,16 +344,16 @@ public: | ||
1218 | |||
1219 | void G1RemSetSummary::print_on(outputStream* out) { | ||
1220 | out->print_cr("\n Recent concurrent refinement statistics"); | ||
1221 | - out->print_cr(" Processed "SIZE_FORMAT" cards", | ||
1222 | + out->print_cr(" Processed " SIZE_FORMAT " cards", | ||
1223 | num_concurrent_refined_cards()); | ||
1224 | - out->print_cr(" Of "SIZE_FORMAT" completed buffers:", num_processed_buf_total()); | ||
1225 | - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by concurrent RS threads.", | ||
1226 | + out->print_cr(" Of " SIZE_FORMAT " completed buffers:", num_processed_buf_total()); | ||
1227 | + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by concurrent RS threads.", | ||
1228 | num_processed_buf_total(), | ||
1229 | percent_of(num_processed_buf_rs_threads(), num_processed_buf_total())); | ||
1230 | - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by mutator threads.", | ||
1231 | + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by mutator threads.", | ||
1232 | num_processed_buf_mutator(), | ||
1233 | percent_of(num_processed_buf_mutator(), num_processed_buf_total())); | ||
1234 | - out->print_cr(" Did "SIZE_FORMAT" coarsenings.", num_coarsenings()); | ||
1235 | + out->print_cr(" Did " SIZE_FORMAT " coarsenings.", num_coarsenings()); | ||
1236 | out->print_cr(" Concurrent RS threads times (s)"); | ||
1237 | out->print(" "); | ||
1238 | for (uint i = 0; i < _num_vtimes; i++) { | ||
1239 | --- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.orig | ||
1240 | +++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp | ||
1241 | @@ -151,7 +151,7 @@ void G1StringDedupQueue::unlink_or_oops_ | ||
1242 | void G1StringDedupQueue::print_statistics(outputStream* st) { | ||
1243 | st->print_cr( | ||
1244 | " [Queue]\n" | ||
1245 | - " [Dropped: "UINTX_FORMAT"]", _queue->_dropped); | ||
1246 | + " [Dropped: " UINTX_FORMAT "]", _queue->_dropped); | ||
1247 | } | ||
1248 | |||
1249 | void G1StringDedupQueue::verify() { | ||
1250 | --- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp.orig | ||
1251 | +++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp | ||
1252 | @@ -80,8 +80,8 @@ void G1StringDedupStat::print_summary(ou | ||
1253 | st->stamp(PrintGCTimeStamps); | ||
1254 | st->print_cr( | ||
1255 | "[GC concurrent-string-deduplication, " | ||
1256 | - G1_STRDEDUP_BYTES_FORMAT_NS"->"G1_STRDEDUP_BYTES_FORMAT_NS"("G1_STRDEDUP_BYTES_FORMAT_NS"), avg " | ||
1257 | - G1_STRDEDUP_PERCENT_FORMAT_NS", "G1_STRDEDUP_TIME_FORMAT"]", | ||
1258 | + G1_STRDEDUP_BYTES_FORMAT_NS "->" G1_STRDEDUP_BYTES_FORMAT_NS "(" G1_STRDEDUP_BYTES_FORMAT_NS "), avg " | ||
1259 | + G1_STRDEDUP_PERCENT_FORMAT_NS ", " G1_STRDEDUP_TIME_FORMAT "]", | ||
1260 | G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes), | ||
1261 | G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes), | ||
1262 | G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes), | ||
1263 | @@ -135,22 +135,22 @@ void G1StringDedupStat::print_statistics | ||
1264 | |||
1265 | if (total) { | ||
1266 | st->print_cr( | ||
1267 | - " [Total Exec: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Idle: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", | ||
1268 | + " [Total Exec: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Idle: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]", | ||
1269 | stat._exec, stat._exec_elapsed, stat._idle, stat._idle_elapsed, stat._block, stat._block_elapsed); | ||
1270 | } else { | ||
1271 | st->print_cr( | ||
1272 | - " [Last Exec: "G1_STRDEDUP_TIME_FORMAT", Idle: "G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", | ||
1273 | + " [Last Exec: " G1_STRDEDUP_TIME_FORMAT ", Idle: " G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]", | ||
1274 | stat._exec_elapsed, stat._idle_elapsed, stat._block, stat._block_elapsed); | ||
1275 | } | ||
1276 | st->print_cr( | ||
1277 | - " [Inspected: "G1_STRDEDUP_OBJECTS_FORMAT"]\n" | ||
1278 | - " [Skipped: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" | ||
1279 | - " [Hashed: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" | ||
1280 | - " [Known: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" | ||
1281 | - " [New: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"]\n" | ||
1282 | - " [Deduplicated: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" | ||
1283 | - " [Young: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" | ||
1284 | - " [Old: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]", | ||
1285 | + " [Inspected: " G1_STRDEDUP_OBJECTS_FORMAT "]\n" | ||
1286 | + " [Skipped: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" | ||
1287 | + " [Hashed: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" | ||
1288 | + " [Known: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" | ||
1289 | + " [New: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "]\n" | ||
1290 | + " [Deduplicated: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" | ||
1291 | + " [Young: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" | ||
1292 | + " [Old: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]", | ||
1293 | stat._inspected, | ||
1294 | stat._skipped, skipped_percent, | ||
1295 | stat._hashed, hashed_percent, | ||
1296 | --- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.orig | ||
1297 | +++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp | ||
1298 | @@ -596,12 +596,12 @@ void G1StringDedupTable::clean_entry_cac | ||
1299 | void G1StringDedupTable::print_statistics(outputStream* st) { | ||
1300 | st->print_cr( | ||
1301 | " [Table]\n" | ||
1302 | - " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n" | ||
1303 | - " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n" | ||
1304 | - " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n" | ||
1305 | - " [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n" | ||
1306 | - " [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n" | ||
1307 | - " [Age Threshold: "UINTX_FORMAT"]", | ||
1308 | + " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n" | ||
1309 | + " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n" | ||
1310 | + " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n" | ||
1311 | + " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n" | ||
1312 | + " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n" | ||
1313 | + " [Age Threshold: " UINTX_FORMAT "]", | ||
1314 | G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)), | ||
1315 | _table->_size, _min_size, _max_size, | ||
1316 | _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed, | ||
1317 | --- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.orig | ||
1318 | +++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp | ||
1319 | @@ -333,7 +333,7 @@ void HeapRegion::note_self_forwarding_re | ||
1320 | bool during_conc_mark, | ||
1321 | size_t marked_bytes) { | ||
1322 | assert(0 <= marked_bytes && marked_bytes <= used(), | ||
1323 | - err_msg("marked: "SIZE_FORMAT" used: "SIZE_FORMAT, | ||
1324 | + err_msg("marked: " SIZE_FORMAT " used: " SIZE_FORMAT, | ||
1325 | marked_bytes, used())); | ||
1326 | _prev_top_at_mark_start = top(); | ||
1327 | _prev_marked_bytes = marked_bytes; | ||
1328 | @@ -514,9 +514,9 @@ class VerifyStrongCodeRootOopClosure: pu | ||
1329 | // Object is in the region. Check that its less than top | ||
1330 | if (_hr->top() <= (HeapWord*)obj) { | ||
1331 | // Object is above top | ||
1332 | - gclog_or_tty->print_cr("Object "PTR_FORMAT" in region " | ||
1333 | - "["PTR_FORMAT", "PTR_FORMAT") is above " | ||
1334 | - "top "PTR_FORMAT, | ||
1335 | + gclog_or_tty->print_cr("Object " PTR_FORMAT " in region " | ||
1336 | + "[" PTR_FORMAT ", " PTR_FORMAT ") is above " | ||
1337 | + "top " PTR_FORMAT, | ||
1338 | (void *)obj, _hr->bottom(), _hr->end(), _hr->top()); | ||
1339 | _failures = true; | ||
1340 | return; | ||
1341 | @@ -550,22 +550,22 @@ public: | ||
1342 | if (nm != NULL) { | ||
1343 | // Verify that the nemthod is live | ||
1344 | if (!nm->is_alive()) { | ||
1345 | - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod " | ||
1346 | - PTR_FORMAT" in its strong code roots", | ||
1347 | + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has dead nmethod " | ||
1348 | + PTR_FORMAT " in its strong code roots", | ||
1349 | _hr->bottom(), _hr->end(), nm); | ||
1350 | _failures = true; | ||
1351 | } else { | ||
1352 | VerifyStrongCodeRootOopClosure oop_cl(_hr, nm); | ||
1353 | nm->oops_do(&oop_cl); | ||
1354 | if (!oop_cl.has_oops_in_region()) { | ||
1355 | - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod " | ||
1356 | - PTR_FORMAT" in its strong code roots " | ||
1357 | + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has nmethod " | ||
1358 | + PTR_FORMAT " in its strong code roots " | ||
1359 | "with no pointers into region", | ||
1360 | _hr->bottom(), _hr->end(), nm); | ||
1361 | _failures = true; | ||
1362 | } else if (oop_cl.failures()) { | ||
1363 | - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other " | ||
1364 | - "failures for nmethod "PTR_FORMAT, | ||
1365 | + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has other " | ||
1366 | + "failures for nmethod " PTR_FORMAT, | ||
1367 | _hr->bottom(), _hr->end(), nm); | ||
1368 | _failures = true; | ||
1369 | } | ||
1370 | @@ -599,8 +599,8 @@ void HeapRegion::verify_strong_code_root | ||
1371 | // on its strong code root list | ||
1372 | if (is_empty()) { | ||
1373 | if (strong_code_roots_length > 0) { | ||
1374 | - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty " | ||
1375 | - "but has "SIZE_FORMAT" code root entries", | ||
1376 | + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is empty " | ||
1377 | + "but has " SIZE_FORMAT " code root entries", | ||
1378 | bottom(), end(), strong_code_roots_length); | ||
1379 | *failures = true; | ||
1380 | } | ||
1381 | @@ -609,8 +609,8 @@ void HeapRegion::verify_strong_code_root | ||
1382 | |||
1383 | if (continuesHumongous()) { | ||
1384 | if (strong_code_roots_length > 0) { | ||
1385 | - gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous " | ||
1386 | - "region but has "SIZE_FORMAT" code root entries", | ||
1387 | + gclog_or_tty->print_cr("region " HR_FORMAT " is a continuation of a humongous " | ||
1388 | + "region but has " SIZE_FORMAT " code root entries", | ||
1389 | HR_FORMAT_PARAMS(this), strong_code_roots_length); | ||
1390 | *failures = true; | ||
1391 | } | ||
1392 | @@ -634,7 +634,7 @@ void HeapRegion::print_on(outputStream* | ||
1393 | else | ||
1394 | st->print(" "); | ||
1395 | st->print(" TS %5d", _gc_time_stamp); | ||
1396 | - st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT, | ||
1397 | + st->print(" PTAMS " PTR_FORMAT " NTAMS " PTR_FORMAT, | ||
1398 | prev_top_at_mark_start(), next_top_at_mark_start()); | ||
1399 | G1OffsetTableContigSpace::print_on(st); | ||
1400 | } | ||
1401 | @@ -708,25 +708,25 @@ public: | ||
1402 | } | ||
1403 | if (!_g1h->is_in_closed_subset(obj)) { | ||
1404 | HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); | ||
1405 | - gclog_or_tty->print_cr("Field "PTR_FORMAT | ||
1406 | - " of live obj "PTR_FORMAT" in region " | ||
1407 | - "["PTR_FORMAT", "PTR_FORMAT")", | ||
1408 | + gclog_or_tty->print_cr("Field " PTR_FORMAT | ||
1409 | + " of live obj " PTR_FORMAT " in region " | ||
1410 | + "[" PTR_FORMAT ", " PTR_FORMAT ")", | ||
1411 | p, (void*) _containing_obj, | ||
1412 | from->bottom(), from->end()); | ||
1413 | print_object(gclog_or_tty, _containing_obj); | ||
1414 | - gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap", | ||
1415 | + gclog_or_tty->print_cr("points to obj " PTR_FORMAT " not in the heap", | ||
1416 | (void*) obj); | ||
1417 | } else { | ||
1418 | HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); | ||
1419 | HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj); | ||
1420 | - gclog_or_tty->print_cr("Field "PTR_FORMAT | ||
1421 | - " of live obj "PTR_FORMAT" in region " | ||
1422 | - "["PTR_FORMAT", "PTR_FORMAT")", | ||
1423 | + gclog_or_tty->print_cr("Field " PTR_FORMAT | ||
1424 | + " of live obj " PTR_FORMAT " in region " | ||
1425 | + "[" PTR_FORMAT ", " PTR_FORMAT ")", | ||
1426 | p, (void*) _containing_obj, | ||
1427 | from->bottom(), from->end()); | ||
1428 | print_object(gclog_or_tty, _containing_obj); | ||
1429 | - gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region " | ||
1430 | - "["PTR_FORMAT", "PTR_FORMAT")", | ||
1431 | + gclog_or_tty->print_cr("points to dead obj " PTR_FORMAT " in region " | ||
1432 | + "[" PTR_FORMAT ", " PTR_FORMAT ")", | ||
1433 | (void*) obj, to->bottom(), to->end()); | ||
1434 | print_object(gclog_or_tty, obj); | ||
1435 | } | ||
1436 | @@ -784,14 +784,14 @@ public: | ||
1437 | gclog_or_tty->print_cr("----------"); | ||
1438 | } | ||
1439 | gclog_or_tty->print_cr("Missing rem set entry:"); | ||
1440 | - gclog_or_tty->print_cr("Field "PTR_FORMAT" " | ||
1441 | - "of obj "PTR_FORMAT", " | ||
1442 | - "in region "HR_FORMAT, | ||
1443 | + gclog_or_tty->print_cr("Field " PTR_FORMAT " " | ||
1444 | + "of obj " PTR_FORMAT ", " | ||
1445 | + "in region " HR_FORMAT, | ||
1446 | p, (void*) _containing_obj, | ||
1447 | HR_FORMAT_PARAMS(from)); | ||
1448 | _containing_obj->print_on(gclog_or_tty); | ||
1449 | - gclog_or_tty->print_cr("points to obj "PTR_FORMAT" " | ||
1450 | - "in region "HR_FORMAT, | ||
1451 | + gclog_or_tty->print_cr("points to obj " PTR_FORMAT " " | ||
1452 | + "in region " HR_FORMAT, | ||
1453 | (void*) obj, | ||
1454 | HR_FORMAT_PARAMS(to)); | ||
1455 | if (obj->is_oop()) { | ||
1456 | @@ -830,8 +830,8 @@ void HeapRegion::verify(VerifyOption vo, | ||
1457 | |||
1458 | if (is_humongous != g1->isHumongous(obj_size) && | ||
1459 | !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects. | ||
1460 | - gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size (" | ||
1461 | - SIZE_FORMAT" words) in a %shumongous region", | ||
1462 | + gclog_or_tty->print_cr("obj " PTR_FORMAT " is of %shumongous size (" | ||
1463 | + SIZE_FORMAT " words) in a %shumongous region", | ||
1464 | p, g1->isHumongous(obj_size) ? "" : "non-", | ||
1465 | obj_size, is_humongous ? "" : "non-"); | ||
1466 | *failures = true; | ||
1467 | @@ -854,12 +854,12 @@ void HeapRegion::verify(VerifyOption vo, | ||
1468 | (vo == VerifyOption_G1UsePrevMarking && | ||
1469 | ClassLoaderDataGraph::unload_list_contains(klass)); | ||
1470 | if (!is_metaspace_object) { | ||
1471 | - gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " | ||
1472 | + gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " " | ||
1473 | "not metadata", klass, (void *)obj); | ||
1474 | *failures = true; | ||
1475 | return; | ||
1476 | } else if (!klass->is_klass()) { | ||
1477 | - gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " | ||
1478 | + gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " " | ||
1479 | "not a klass", klass, (void *)obj); | ||
1480 | *failures = true; | ||
1481 | return; | ||
1482 | @@ -891,7 +891,7 @@ void HeapRegion::verify(VerifyOption vo, | ||
1483 | } | ||
1484 | } | ||
1485 | } else { | ||
1486 | - gclog_or_tty->print_cr(PTR_FORMAT" not an oop", (void *)obj); | ||
1487 | + gclog_or_tty->print_cr(PTR_FORMAT " not an oop", (void *)obj); | ||
1488 | *failures = true; | ||
1489 | return; | ||
1490 | } | ||
1491 | @@ -901,8 +901,8 @@ void HeapRegion::verify(VerifyOption vo, | ||
1492 | } | ||
1493 | |||
1494 | if (p != top()) { | ||
1495 | - gclog_or_tty->print_cr("end of last object "PTR_FORMAT" " | ||
1496 | - "does not match top "PTR_FORMAT, p, top()); | ||
1497 | + gclog_or_tty->print_cr("end of last object " PTR_FORMAT " " | ||
1498 | + "does not match top " PTR_FORMAT, p, top()); | ||
1499 | *failures = true; | ||
1500 | return; | ||
1501 | } | ||
1502 | @@ -917,8 +917,8 @@ void HeapRegion::verify(VerifyOption vo, | ||
1503 | HeapWord* addr_1 = p; | ||
1504 | HeapWord* b_start_1 = _offsets.block_start_const(addr_1); | ||
1505 | if (b_start_1 != p) { | ||
1506 | - gclog_or_tty->print_cr("BOT look up for top: "PTR_FORMAT" " | ||
1507 | - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, | ||
1508 | + gclog_or_tty->print_cr("BOT look up for top: " PTR_FORMAT " " | ||
1509 | + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, | ||
1510 | addr_1, b_start_1, p); | ||
1511 | *failures = true; | ||
1512 | return; | ||
1513 | @@ -929,8 +929,8 @@ void HeapRegion::verify(VerifyOption vo, | ||
1514 | if (addr_2 < the_end) { | ||
1515 | HeapWord* b_start_2 = _offsets.block_start_const(addr_2); | ||
1516 | if (b_start_2 != p) { | ||
1517 | - gclog_or_tty->print_cr("BOT look up for top + 1: "PTR_FORMAT" " | ||
1518 | - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, | ||
1519 | + gclog_or_tty->print_cr("BOT look up for top + 1: " PTR_FORMAT " " | ||
1520 | + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, | ||
1521 | addr_2, b_start_2, p); | ||
1522 | *failures = true; | ||
1523 | return; | ||
1524 | @@ -943,8 +943,8 @@ void HeapRegion::verify(VerifyOption vo, | ||
1525 | if (addr_3 < the_end) { | ||
1526 | HeapWord* b_start_3 = _offsets.block_start_const(addr_3); | ||
1527 | if (b_start_3 != p) { | ||
1528 | - gclog_or_tty->print_cr("BOT look up for top + diff: "PTR_FORMAT" " | ||
1529 | - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, | ||
1530 | + gclog_or_tty->print_cr("BOT look up for top + diff: " PTR_FORMAT " " | ||
1531 | + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, | ||
1532 | addr_3, b_start_3, p); | ||
1533 | *failures = true; | ||
1534 | return; | ||
1535 | @@ -955,8 +955,8 @@ void HeapRegion::verify(VerifyOption vo, | ||
1536 | HeapWord* addr_4 = the_end - 1; | ||
1537 | HeapWord* b_start_4 = _offsets.block_start_const(addr_4); | ||
1538 | if (b_start_4 != p) { | ||
1539 | - gclog_or_tty->print_cr("BOT look up for end - 1: "PTR_FORMAT" " | ||
1540 | - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, | ||
1541 | + gclog_or_tty->print_cr("BOT look up for end - 1: " PTR_FORMAT " " | ||
1542 | + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, | ||
1543 | addr_4, b_start_4, p); | ||
1544 | *failures = true; | ||
1545 | return; | ||
1546 | @@ -964,8 +964,8 @@ void HeapRegion::verify(VerifyOption vo, | ||
1547 | } | ||
1548 | |||
1549 | if (is_humongous && object_num > 1) { | ||
1550 | - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous " | ||
1551 | - "but has "SIZE_FORMAT", objects", | ||
1552 | + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is humongous " | ||
1553 | + "but has " SIZE_FORMAT ", objects", | ||
1554 | bottom(), end(), object_num); | ||
1555 | *failures = true; | ||
1556 | return; | ||
1557 | --- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp.orig | ||
1558 | +++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp | ||
1559 | @@ -52,7 +52,7 @@ class HeapRegion; | ||
1560 | class HeapRegionSetBase; | ||
1561 | class nmethod; | ||
1562 | |||
1563 | -#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]" | ||
1564 | +#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]" | ||
1565 | #define HR_FORMAT_PARAMS(_hr_) \ | ||
1566 | (_hr_)->hrm_index(), \ | ||
1567 | (_hr_)->get_short_type_str(), \ | ||
1568 | @@ -534,8 +534,8 @@ class HeapRegion: public G1OffsetTableCo | ||
1569 | void set_containing_set(HeapRegionSetBase* containing_set) { | ||
1570 | assert((containing_set == NULL && _containing_set != NULL) || | ||
1571 | (containing_set != NULL && _containing_set == NULL), | ||
1572 | - err_msg("containing_set: "PTR_FORMAT" " | ||
1573 | - "_containing_set: "PTR_FORMAT, | ||
1574 | + err_msg("containing_set: " PTR_FORMAT " " | ||
1575 | + "_containing_set: " PTR_FORMAT, | ||
1576 | p2i(containing_set), p2i(_containing_set))); | ||
1577 | |||
1578 | _containing_set = containing_set; | ||
1579 | --- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.orig | ||
1580 | +++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp | ||
1581 | @@ -112,7 +112,7 @@ HeapRegion::block_size(const HeapWord *a | ||
1582 | |||
1583 | assert(ClassUnloadingWithConcurrentMark, | ||
1584 | err_msg("All blocks should be objects if G1 Class Unloading isn't used. " | ||
1585 | - "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") " | ||
1586 | + "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") " | ||
1587 | "addr: " PTR_FORMAT, | ||
1588 | p2i(bottom()), p2i(top()), p2i(end()), p2i(addr))); | ||
1589 | |||
1590 | --- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp.orig | ||
1591 | +++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp | ||
1592 | @@ -432,7 +432,7 @@ void HeapRegionManager::verify() { | ||
1593 | HeapRegion* hr = _regions.get_by_index(i); | ||
1594 | guarantee(hr != NULL, err_msg("invariant: i: %u", i)); | ||
1595 | guarantee(!prev_committed || hr->bottom() == prev_end, | ||
1596 | - err_msg("invariant i: %u "HR_FORMAT" prev_end: "PTR_FORMAT, | ||
1597 | + err_msg("invariant i: %u " HR_FORMAT " prev_end: " PTR_FORMAT, | ||
1598 | i, HR_FORMAT_PARAMS(hr), p2i(prev_end))); | ||
1599 | guarantee(hr->hrm_index() == i, | ||
1600 | err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index())); | ||
1601 | --- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp.orig | ||
1602 | +++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp | ||
1603 | @@ -31,9 +31,9 @@ | ||
1604 | |||
1605 | inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const { | ||
1606 | assert(addr < heap_end(), | ||
1607 | - err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end()))); | ||
1608 | + err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end()))); | ||
1609 | assert(addr >= heap_bottom(), | ||
1610 | - err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); | ||
1611 | + err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); | ||
1612 | |||
1613 | HeapRegion* hr = _regions.get_by_address(addr); | ||
1614 | return hr; | ||
1615 | --- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.orig | ||
1616 | +++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | ||
1617 | @@ -91,7 +91,7 @@ protected: | ||
1618 | // concurrency. | ||
1619 | |||
1620 | if (G1TraceHeapRegionRememberedSet) { | ||
1621 | - gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT").", | ||
1622 | + gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").", | ||
1623 | from, | ||
1624 | UseCompressedOops | ||
1625 | ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from) | ||
1626 | @@ -381,7 +381,7 @@ void FromCardCache::initialize(uint n_pa | ||
1627 | |||
1628 | void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) { | ||
1629 | guarantee((size_t)start_idx + new_num_regions <= max_uintx, | ||
1630 | - err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT, | ||
1631 | + err_msg("Trying to invalidate beyond maximum region, from %u size " SIZE_FORMAT, | ||
1632 | start_idx, new_num_regions)); | ||
1633 | for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { | ||
1634 | uint end_idx = (start_idx + (uint)new_num_regions); | ||
1635 | @@ -396,7 +396,7 @@ void FromCardCache::invalidate(uint star | ||
1636 | void FromCardCache::print(outputStream* out) { | ||
1637 | for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { | ||
1638 | for (uint j = 0; j < _max_regions; j++) { | ||
1639 | - out->print_cr("_from_card_cache["UINT32_FORMAT"]["UINT32_FORMAT"] = "INT32_FORMAT".", | ||
1640 | + out->print_cr("_from_card_cache[" UINT32_FORMAT "][" UINT32_FORMAT "] = " INT32_FORMAT ".", | ||
1641 | i, j, at(i, j)); | ||
1642 | } | ||
1643 | } | ||
1644 | @@ -436,7 +436,7 @@ void OtherRegionsTable::add_reference(Oo | ||
1645 | int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift); | ||
1646 | |||
1647 | if (G1TraceHeapRegionRememberedSet) { | ||
1648 | - gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = "INT32_FORMAT")", | ||
1649 | + gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = " INT32_FORMAT ")", | ||
1650 | hr()->bottom(), from_card, | ||
1651 | FromCardCache::at((uint)tid, cur_hrm_ind)); | ||
1652 | } | ||
1653 | @@ -642,13 +642,13 @@ void OtherRegionsTable::scrub(CardTableM | ||
1654 | |||
1655 | assert(_coarse_map.size() == region_bm->size(), "Precondition"); | ||
1656 | if (G1RSScrubVerbose) { | ||
1657 | - gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...", | ||
1658 | + gclog_or_tty->print(" Coarse map: before = " SIZE_FORMAT "...", | ||
1659 | _n_coarse_entries); | ||
1660 | } | ||
1661 | _coarse_map.set_intersection(*region_bm); | ||
1662 | _n_coarse_entries = _coarse_map.count_one_bits(); | ||
1663 | if (G1RSScrubVerbose) { | ||
1664 | - gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries); | ||
1665 | + gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries); | ||
1666 | } | ||
1667 | |||
1668 | // Now do the fine-grained maps. | ||
1669 | @@ -1044,7 +1044,7 @@ bool HeapRegionRemSetIterator::fine_has_ | ||
1670 | |||
1671 | card_index = _cur_region_card_offset + _cur_card_in_prt; | ||
1672 | guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion, | ||
1673 | - err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt)); | ||
1674 | + err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt)); | ||
1675 | return true; | ||
1676 | } | ||
1677 | |||
1678 | @@ -1213,8 +1213,8 @@ void PerRegionTable::test_fl_mem_size() | ||
1679 | |||
1680 | size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize; | ||
1681 | assert(dummy->mem_size() > min_prt_size, | ||
1682 | - err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. " | ||
1683 | - "Should be at least "SIZE_FORMAT" bytes.", dummy->mem_size(), min_prt_size)); | ||
1684 | + err_msg("PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. " | ||
1685 | + "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size)); | ||
1686 | free(dummy); | ||
1687 | guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size"); | ||
1688 | // try to reset the state | ||
1689 | --- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.orig | ||
1690 | +++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp | ||
1691 | @@ -32,7 +32,7 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | ||
1692 | uint FreeRegionList::_unrealistically_long_length = 0; | ||
1693 | |||
1694 | void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) { | ||
1695 | - msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT, | ||
1696 | + msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT, | ||
1697 | name(), message, length(), total_capacity_bytes()); | ||
1698 | fill_in_ext_msg_extra(msg); | ||
1699 | } | ||
1700 | @@ -84,13 +84,13 @@ void HeapRegionSetBase::verify_end() { | ||
1701 | |||
1702 | void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) { | ||
1703 | out->cr(); | ||
1704 | - out->print_cr("Set: %s ("PTR_FORMAT")", name(), this); | ||
1705 | + out->print_cr("Set: %s (" PTR_FORMAT ")", name(), this); | ||
1706 | out->print_cr(" Region Assumptions"); | ||
1707 | out->print_cr(" humongous : %s", BOOL_TO_STR(regions_humongous())); | ||
1708 | out->print_cr(" free : %s", BOOL_TO_STR(regions_free())); | ||
1709 | out->print_cr(" Attributes"); | ||
1710 | out->print_cr(" length : %14u", length()); | ||
1711 | - out->print_cr(" total capacity : "SIZE_FORMAT_W(14)" bytes", | ||
1712 | + out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes", | ||
1713 | total_capacity_bytes()); | ||
1714 | } | ||
1715 | |||
1716 | @@ -106,7 +106,7 @@ void FreeRegionList::set_unrealistically | ||
1717 | } | ||
1718 | |||
1719 | void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) { | ||
1720 | - msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail); | ||
1721 | + msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, _head, _tail); | ||
1722 | } | ||
1723 | |||
1724 | void FreeRegionList::remove_all() { | ||
1725 | @@ -277,8 +277,8 @@ void FreeRegionList::clear() { | ||
1726 | void FreeRegionList::print_on(outputStream* out, bool print_contents) { | ||
1727 | HeapRegionSetBase::print_on(out, print_contents); | ||
1728 | out->print_cr(" Linking"); | ||
1729 | - out->print_cr(" head : "PTR_FORMAT, _head); | ||
1730 | - out->print_cr(" tail : "PTR_FORMAT, _tail); | ||
1731 | + out->print_cr(" head : " PTR_FORMAT, _head); | ||
1732 | + out->print_cr(" tail : " PTR_FORMAT, _tail); | ||
1733 | |||
1734 | if (print_contents) { | ||
1735 | out->print_cr(" Contents"); | ||
1736 | @@ -306,7 +306,7 @@ void FreeRegionList::verify_list() { | ||
1737 | |||
1738 | count++; | ||
1739 | guarantee(count < _unrealistically_long_length, | ||
1740 | - hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u", name(), count, curr, prev0, prev1, length())); | ||
1741 | + hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: " PTR_FORMAT " prev0: " PTR_FORMAT " " "prev1: " PTR_FORMAT " length: %u", name(), count, curr, prev0, prev1, length())); | ||
1742 | |||
1743 | if (curr->next() != NULL) { | ||
1744 | guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up"); | ||
1745 | --- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.orig | ||
1746 | +++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp | ||
1747 | @@ -668,7 +668,7 @@ jlong PSMarkSweep::millis_since_last_gc( | ||
1748 | jlong ret_val = now - _time_of_last_gc; | ||
1749 | // XXX See note in genCollectedHeap::millis_since_last_gc(). | ||
1750 | if (ret_val < 0) { | ||
1751 | - NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);) | ||
1752 | + NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);) | ||
1753 | return 0; | ||
1754 | } | ||
1755 | return ret_val; | ||
1756 | --- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.orig | ||
1757 | +++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | ||
1758 | @@ -3291,7 +3291,7 @@ jlong PSParallelCompact::millis_since_la | ||
1759 | jlong ret_val = now - _time_of_last_gc; | ||
1760 | // XXX See note in genCollectedHeap::millis_since_last_gc(). | ||
1761 | if (ret_val < 0) { | ||
1762 | - NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);) | ||
1763 | + NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);) | ||
1764 | return 0; | ||
1765 | } | ||
1766 | return ret_val; | ||
1767 | --- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.orig | ||
1768 | +++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp | ||
1769 | @@ -86,7 +86,7 @@ void MutableNUMASpace::ensure_parsabilit | ||
1770 | while (words_left_to_fill > 0) { | ||
1771 | size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size()); | ||
1772 | assert(words_to_fill >= CollectedHeap::min_fill_size(), | ||
1773 | - err_msg("Remaining size ("SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")", | ||
1774 | + err_msg("Remaining size (" SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")", | ||
1775 | words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size())); | ||
1776 | CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill); | ||
1777 | if (!os::numa_has_static_binding()) { | ||
1778 | --- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp.orig | ||
1779 | +++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp | ||
1780 | @@ -98,10 +98,10 @@ void PLABStats::adjust_desired_plab_sz(u | ||
1781 | if (_allocated == 0) { | ||
1782 | assert(_unused == 0, | ||
1783 | err_msg("Inconsistency in PLAB stats: " | ||
1784 | - "_allocated: "SIZE_FORMAT", " | ||
1785 | - "_wasted: "SIZE_FORMAT", " | ||
1786 | - "_unused: "SIZE_FORMAT", " | ||
1787 | - "_used : "SIZE_FORMAT, | ||
1788 | + "_allocated: " SIZE_FORMAT ", " | ||
1789 | + "_wasted: " SIZE_FORMAT ", " | ||
1790 | + "_unused: " SIZE_FORMAT ", " | ||
1791 | + "_used : " SIZE_FORMAT, | ||
1792 | _allocated, _wasted, _unused, _used)); | ||
1793 | |||
1794 | _allocated = 1; | ||
1795 | --- hotspot/src/share/vm/memory/cardTableModRefBS.hpp.orig | ||
1796 | +++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp | ||
1797 | @@ -158,8 +158,8 @@ class CardTableModRefBS: public ModRefBa | ||
1798 | // Mapping from address to card marking array entry | ||
1799 | jbyte* byte_for(const void* p) const { | ||
1800 | assert(_whole_heap.contains(p), | ||
1801 | - err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of " | ||
1802 | - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", | ||
1803 | + err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of " | ||
1804 | + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", | ||
1805 | p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); | ||
1806 | jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift]; | ||
1807 | assert(result >= _byte_map && result < _byte_map + _byte_map_size, | ||
1808 | @@ -436,8 +436,8 @@ public: | ||
1809 | size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte)); | ||
1810 | HeapWord* result = (HeapWord*) (delta << card_shift); | ||
1811 | assert(_whole_heap.contains(result), | ||
1812 | - err_msg("Returning result = "PTR_FORMAT" out of bounds of " | ||
1813 | - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", | ||
1814 | + err_msg("Returning result = " PTR_FORMAT " out of bounds of " | ||
1815 | + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", | ||
1816 | p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); | ||
1817 | return result; | ||
1818 | } | ||
1819 | @@ -445,8 +445,8 @@ public: | ||
1820 | // Mapping from address to card marking array index. | ||
1821 | size_t index_for(void* p) { | ||
1822 | assert(_whole_heap.contains(p), | ||
1823 | - err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of " | ||
1824 | - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", | ||
1825 | + err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of " | ||
1826 | + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", | ||
1827 | p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); | ||
1828 | return byte_for(p) - _byte_map; | ||
1829 | } | ||
1830 | --- hotspot/src/share/vm/memory/genCollectedHeap.cpp.orig | ||
1831 | +++ hotspot/src/share/vm/memory/genCollectedHeap.cpp | ||
1832 | @@ -1403,7 +1403,7 @@ jlong GenCollectedHeap::millis_since_las | ||
1833 | // back a time later than 'now'. | ||
1834 | jlong retVal = now - tolgc_cl.time(); | ||
1835 | if (retVal < 0) { | ||
1836 | - NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);) | ||
1837 | + NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);) | ||
1838 | return 0; | ||
1839 | } | ||
1840 | return retVal; | ||
1841 | --- hotspot/src/share/vm/memory/generation.cpp.orig | ||
1842 | +++ hotspot/src/share/vm/memory/generation.cpp | ||
1843 | @@ -187,7 +187,7 @@ bool Generation::promotion_attempt_is_sa | ||
1844 | bool res = (available >= max_promotion_in_bytes); | ||
1845 | if (PrintGC && Verbose) { | ||
1846 | gclog_or_tty->print_cr( | ||
1847 | - "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")", | ||
1848 | + "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")", | ||
1849 | res? "":" not", available, res? ">=":"<", | ||
1850 | max_promotion_in_bytes); | ||
1851 | } | ||
1852 | --- hotspot/src/share/vm/memory/generation.hpp.orig | ||
1853 | +++ hotspot/src/share/vm/memory/generation.hpp | ||
1854 | @@ -422,7 +422,7 @@ class Generation: public CHeapObj<mtGC> | ||
1855 | // have to guard against non-monotonicity. | ||
1856 | NOT_PRODUCT( | ||
1857 | if (now < _time_of_last_gc) { | ||
1858 | - warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); | ||
1859 | + warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); | ||
1860 | } | ||
1861 | ) | ||
1862 | return _time_of_last_gc; | ||
1863 | --- hotspot/src/share/vm/memory/referenceProcessor.cpp.orig | ||
1864 | +++ hotspot/src/share/vm/memory/referenceProcessor.cpp | ||
1865 | @@ -161,7 +161,7 @@ void ReferenceProcessor::update_soft_ref | ||
1866 | |||
1867 | NOT_PRODUCT( | ||
1868 | if (now < _soft_ref_timestamp_clock) { | ||
1869 | - warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, | ||
1870 | + warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, | ||
1871 | _soft_ref_timestamp_clock, now); | ||
1872 | } | ||
1873 | ) | ||
1874 | --- hotspot/src/share/vm/memory/tenuredGeneration.cpp.orig | ||
1875 | +++ hotspot/src/share/vm/memory/tenuredGeneration.cpp | ||
1876 | @@ -294,8 +294,8 @@ bool TenuredGeneration::promotion_attemp | ||
1877 | bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); | ||
1878 | if (PrintGC && Verbose) { | ||
1879 | gclog_or_tty->print_cr( | ||
1880 | - "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT")," | ||
1881 | - "max_promo("SIZE_FORMAT")", | ||
1882 | + "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT ")," | ||
1883 | + "max_promo(" SIZE_FORMAT ")", | ||
1884 | res? "":" not", available, res? ">=":"<", | ||
1885 | av_promo, max_promotion_in_bytes); | ||
1886 | } | ||
1887 | --- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.orig | ||
1888 | +++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp | ||
1889 | @@ -94,10 +94,10 @@ void ThreadLocalAllocBuffer::record_slow | ||
1890 | |||
1891 | if (PrintTLAB && Verbose) { | ||
1892 | Thread* thrd = myThread(); | ||
1893 | - gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]" | ||
1894 | - " obj: "SIZE_FORMAT | ||
1895 | - " free: "SIZE_FORMAT | ||
1896 | - " waste: "SIZE_FORMAT"\n", | ||
1897 | + gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]" | ||
1898 | + " obj: " SIZE_FORMAT | ||
1899 | + " free: " SIZE_FORMAT | ||
1900 | + " waste: " SIZE_FORMAT "\n", | ||
1901 | "slow", p2i(thrd), thrd->osthread()->thread_id(), | ||
1902 | obj_size, free(), refill_waste_limit()); | ||
1903 | } | ||
1904 | --- hotspot/src/share/vm/memory/universe.cpp.orig | ||
1905 | +++ hotspot/src/share/vm/memory/universe.cpp | ||
1906 | @@ -926,7 +926,7 @@ void Universe::print_compressed_oops_mod | ||
1907 | // Reserve the Java heap, which is now the same for all GCs. | ||
1908 | ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) { | ||
1909 | assert(alignment <= Arguments::conservative_max_heap_alignment(), | ||
1910 | - err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT, | ||
1911 | + err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT, | ||
1912 | alignment, Arguments::conservative_max_heap_alignment())); | ||
1913 | size_t total_reserved = align_size_up(heap_size, alignment); | ||
1914 | assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())), | ||
1915 | --- hotspot/src/share/vm/oops/constantPool.cpp.orig | ||
1916 | +++ hotspot/src/share/vm/oops/constantPool.cpp | ||
1917 | @@ -1494,7 +1494,7 @@ static void print_cpool_bytes(jint cnt, | ||
1918 | } | ||
1919 | case JVM_CONSTANT_Long: { | ||
1920 | u8 val = Bytes::get_Java_u8(bytes); | ||
1921 | - printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val); | ||
1922 | + printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val); | ||
1923 | ent_size = 8; | ||
1924 | idx++; // Long takes two cpool slots | ||
1925 | break; | ||
1926 | --- hotspot/src/share/vm/oops/cpCache.cpp.orig | ||
1927 | +++ hotspot/src/share/vm/oops/cpCache.cpp | ||
1928 | @@ -315,7 +315,7 @@ void ConstantPoolCacheEntry::set_method_ | ||
1929 | adapter->size_of_parameters()); | ||
1930 | |||
1931 | if (TraceInvokeDynamic) { | ||
1932 | - tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ", | ||
1933 | + tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ", | ||
1934 | invoke_code, | ||
1935 | (void *)appendix(), (has_appendix ? "" : " (unused)"), | ||
1936 | (void *)method_type(), (has_method_type ? "" : " (unused)"), | ||
1937 | @@ -529,12 +529,12 @@ void ConstantPoolCacheEntry::print(outpu | ||
1938 | // print separator | ||
1939 | if (index == 0) st->print_cr(" -------------"); | ||
1940 | // print entry | ||
1941 | - st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this); | ||
1942 | + st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this); | ||
1943 | st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(), | ||
1944 | constant_pool_index()); | ||
1945 | - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1); | ||
1946 | - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2); | ||
1947 | - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags); | ||
1948 | + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1); | ||
1949 | + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2); | ||
1950 | + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags); | ||
1951 | st->print_cr(" -------------"); | ||
1952 | } | ||
1953 | |||
1954 | --- hotspot/src/share/vm/oops/markOop.cpp.orig | ||
1955 | +++ hotspot/src/share/vm/oops/markOop.cpp | ||
1956 | @@ -49,7 +49,7 @@ void markOopDesc::print_on(outputStream* | ||
1957 | st->print("monitor=NULL"); | ||
1958 | else { | ||
1959 | BasicLock * bl = (BasicLock *) mon->owner(); | ||
1960 | - st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}", | ||
1961 | + st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}", | ||
1962 | mon->count(), mon->waiters(), mon->recursions(), p2i(bl)); | ||
1963 | } | ||
1964 | } else { | ||
1965 | --- hotspot/src/share/vm/oops/objArrayKlass.cpp.orig | ||
1966 | +++ hotspot/src/share/vm/oops/objArrayKlass.cpp | ||
1967 | @@ -657,7 +657,7 @@ void ObjArrayKlass::oop_print_value_on(o | ||
1968 | if (i > max_objArray_print_length) { | ||
1969 | st->print("..."); break; | ||
1970 | } | ||
1971 | - st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i)); | ||
1972 | + st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i)); | ||
1973 | } | ||
1974 | st->print(" }"); | ||
1975 | } | ||
1976 | --- hotspot/src/share/vm/oops/oop.cpp.orig | ||
1977 | +++ hotspot/src/share/vm/oops/oop.cpp | ||
1978 | @@ -46,7 +46,7 @@ void oopDesc::print_on(outputStream* st) | ||
1979 | |||
1980 | void oopDesc::print_address_on(outputStream* st) const { | ||
1981 | if (PrintOopAddress) { | ||
1982 | - st->print("{"INTPTR_FORMAT"}", this); | ||
1983 | + st->print("{" INTPTR_FORMAT "}", this); | ||
1984 | } | ||
1985 | } | ||
1986 | |||
1987 | --- hotspot/src/share/vm/prims/methodHandles.cpp.orig | ||
1988 | +++ hotspot/src/share/vm/prims/methodHandles.cpp | ||
1989 | @@ -1342,27 +1342,27 @@ JVM_END | ||
1990 | |||
1991 | // These are the native methods on java.lang.invoke.MethodHandleNatives. | ||
1992 | static JNINativeMethod MHN_methods[] = { | ||
1993 | - {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)}, | ||
1994 | - {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)}, | ||
1995 | - {CC"resolve", CC"("MEM""CLS")"MEM, FN_PTR(MHN_resolve_Mem)}, | ||
1996 | - {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)}, | ||
1997 | + {CC "init", CC "(" MEM "" OBJ ")V", FN_PTR(MHN_init_Mem)}, | ||
1998 | + {CC "expand", CC "(" MEM ")V", FN_PTR(MHN_expand_Mem)}, | ||
1999 | + {CC "resolve", CC "(" MEM "" CLS ")" MEM, FN_PTR(MHN_resolve_Mem)}, | ||
2000 | + {CC "getConstant", CC "(I)I", FN_PTR(MHN_getConstant)}, | ||
2001 | // static native int getNamedCon(int which, Object[] name) | ||
2002 | - {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)}, | ||
2003 | + {CC "getNamedCon", CC "(I[" OBJ ")I", FN_PTR(MHN_getNamedCon)}, | ||
2004 | // static native int getMembers(Class<?> defc, String matchName, String matchSig, | ||
2005 | // int matchFlags, Class<?> caller, int skip, MemberName[] results); | ||
2006 | - {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)}, | ||
2007 | - {CC"objectFieldOffset", CC"("MEM")J", FN_PTR(MHN_objectFieldOffset)}, | ||
2008 | - {CC"setCallSiteTargetNormal", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetNormal)}, | ||
2009 | - {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, | ||
2010 | - {CC"staticFieldOffset", CC"("MEM")J", FN_PTR(MHN_staticFieldOffset)}, | ||
2011 | - {CC"staticFieldBase", CC"("MEM")"OBJ, FN_PTR(MHN_staticFieldBase)}, | ||
2012 | - {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)} | ||
2013 | + {CC "getMembers", CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)}, | ||
2014 | + {CC "objectFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_objectFieldOffset)}, | ||
2015 | + {CC "setCallSiteTargetNormal", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetNormal)}, | ||
2016 | + {CC "setCallSiteTargetVolatile", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, | ||
2017 | + {CC "staticFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_staticFieldOffset)}, | ||
2018 | + {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)}, | ||
2019 | + {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)} | ||
2020 | }; | ||
2021 | |||
2022 | static JNINativeMethod MH_methods[] = { | ||
2023 | // UnsupportedOperationException throwers | ||
2024 | - {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)}, | ||
2025 | - {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)} | ||
2026 | + {CC"invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)}, | ||
2027 | + {CC"invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)} | ||
2028 | }; | ||
2029 | |||
2030 | /** | ||
2031 | --- hotspot/src/share/vm/prims/perf.cpp.orig | ||
2032 | +++ hotspot/src/share/vm/prims/perf.cpp | ||
2033 | @@ -290,17 +290,17 @@ PERF_END | ||
2034 | #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) | ||
2035 | #define BB "Ljava/nio/ByteBuffer;" | ||
2036 | #define JLS "Ljava/lang/String;" | ||
2037 | -#define CL_ARGS CC"("JLS"IIJ)"BB | ||
2038 | -#define CBA_ARGS CC"("JLS"II[BI)"BB | ||
2039 | +#define CL_ARGS CC "(" JLS "IIJ)" BB | ||
2040 | +#define CBA_ARGS CC "(" JLS "II[BI)" BB | ||
2041 | |||
2042 | static JNINativeMethod perfmethods[] = { | ||
2043 | |||
2044 | - {CC"attach", CC"("JLS"II)"BB, FN_PTR(Perf_Attach)}, | ||
2045 | - {CC"detach", CC"("BB")V", FN_PTR(Perf_Detach)}, | ||
2046 | - {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, | ||
2047 | - {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)}, | ||
2048 | - {CC"highResCounter", CC"()J", FN_PTR(Perf_HighResCounter)}, | ||
2049 | - {CC"highResFrequency", CC"()J", FN_PTR(Perf_HighResFrequency)} | ||
2050 | + {CC"attach", CC "(" JLS "II)" BB, FN_PTR(Perf_Attach)}, | ||
2051 | + {CC"detach", CC "(" BB ")V", FN_PTR(Perf_Detach)}, | ||
2052 | + {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, | ||
2053 | + {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)}, | ||
2054 | + {CC"highResCounter", CC "()J", FN_PTR(Perf_HighResCounter)}, | ||
2055 | + {CC"highResFrequency", CC "()J", FN_PTR(Perf_HighResFrequency)} | ||
2056 | }; | ||
2057 | |||
2058 | #undef CBA_ARGS | ||
2059 | --- hotspot/src/share/vm/prims/unsafe.cpp.orig | ||
2060 | +++ hotspot/src/share/vm/prims/unsafe.cpp | ||
2061 | @@ -1001,7 +1001,7 @@ UNSAFE_ENTRY(jclass, Unsafe_DefineClass0 | ||
2062 | UNSAFE_END | ||
2063 | |||
2064 | |||
2065 | -#define DAC_Args CLS"[B["OBJ | ||
2066 | +#define DAC_Args CLS "[B[" OBJ | ||
2067 | // define a class but do not make it known to the class loader or system dictionary | ||
2068 | // - host_class: supplies context for linkage, access control, protection domain, and class loader | ||
2069 | // - data: bytes of a class file, a raw memory address (length gives the number of bytes) | ||
2070 | @@ -1366,47 +1366,47 @@ UNSAFE_END | ||
2071 | |||
2072 | #define LANG "Ljava/lang/" | ||
2073 | |||
2074 | -#define OBJ LANG"Object;" | ||
2075 | -#define CLS LANG"Class;" | ||
2076 | -#define CTR LANG"reflect/Constructor;" | ||
2077 | -#define FLD LANG"reflect/Field;" | ||
2078 | -#define MTH LANG"reflect/Method;" | ||
2079 | -#define THR LANG"Throwable;" | ||
2080 | +#define OBJ LANG "Object;" | ||
2081 | +#define CLS LANG "Class;" | ||
2082 | +#define CTR LANG "reflect/Constructor;" | ||
2083 | +#define FLD LANG "reflect/Field;" | ||
2084 | +#define MTH LANG "reflect/Method;" | ||
2085 | +#define THR LANG "Throwable;" | ||
2086 | |||
2087 | -#define DC0_Args LANG"String;[BII" | ||
2088 | -#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;" | ||
2089 | +#define DC0_Args LANG "String;[BII" | ||
2090 | +#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;" | ||
2091 | |||
2092 | #define CC (char*) /*cast a literal from (const char*)*/ | ||
2093 | #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) | ||
2094 | |||
2095 | // define deprecated accessors for compabitility with 1.4.0 | ||
2096 | #define DECLARE_GETSETOOP_140(Boolean, Z) \ | ||
2097 | - {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ | ||
2098 | - {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)} | ||
2099 | + {CC"get"#Boolean, CC"(" OBJ "I)" #Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ | ||
2100 | + {CC"put"#Boolean, CC"(" OBJ "I" #Z ")V", FN_PTR(Unsafe_Set##Boolean##140)} | ||
2101 | |||
2102 | // Note: In 1.4.1, getObject and kin take both int and long offsets. | ||
2103 | #define DECLARE_GETSETOOP_141(Boolean, Z) \ | ||
2104 | - {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ | ||
2105 | - {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)} | ||
2106 | + {CC"get"#Boolean, CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \ | ||
2107 | + {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)} | ||
2108 | |||
2109 | // Note: In 1.5.0, there are volatile versions too | ||
2110 | #define DECLARE_GETSETOOP(Boolean, Z) \ | ||
2111 | - {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ | ||
2112 | - {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \ | ||
2113 | - {CC"get"#Boolean"Volatile", CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ | ||
2114 | - {CC"put"#Boolean"Volatile", CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} | ||
2115 | + {CC"get"#Boolean, CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \ | ||
2116 | + {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}, \ | ||
2117 | + {CC"get"#Boolean "Volatile", CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ | ||
2118 | + {CC"put"#Boolean "Volatile", CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} | ||
2119 | |||
2120 | |||
2121 | #define DECLARE_GETSETNATIVE(Byte, B) \ | ||
2122 | - {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \ | ||
2123 | - {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)} | ||
2124 | + {CC"get"#Byte, CC"(" ADR ")" #B, FN_PTR(Unsafe_GetNative##Byte)}, \ | ||
2125 | + {CC"put"#Byte, CC"(" ADR #B ")V", FN_PTR(Unsafe_SetNative##Byte)} | ||
2126 | |||
2127 | |||
2128 | |||
2129 | // These are the methods for 1.4.0 | ||
2130 | static JNINativeMethod methods_140[] = { | ||
2131 | - {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)}, | ||
2132 | - {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)}, | ||
2133 | + {CC"getObject", CC"(" OBJ "I)" OBJ "", FN_PTR(Unsafe_GetObject140)}, | ||
2134 | + {CC"putObject", CC"(" OBJ "I" OBJ ")V", FN_PTR(Unsafe_SetObject140)}, | ||
2135 | |||
2136 | DECLARE_GETSETOOP_140(Boolean, Z), | ||
2137 | DECLARE_GETSETOOP_140(Byte, B), | ||
2138 | @@ -1425,33 +1425,33 @@ static JNINativeMethod methods_140[] = { | ||
2139 | DECLARE_GETSETNATIVE(Float, F), | ||
2140 | DECLARE_GETSETNATIVE(Double, D), | ||
2141 | |||
2142 | - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2143 | - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2144 | + {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2145 | + {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2146 | |||
2147 | - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2148 | - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2149 | - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2150 | - | ||
2151 | - {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)}, | ||
2152 | - {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, | ||
2153 | - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2154 | - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2155 | - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2156 | + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2157 | + {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2158 | + {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2159 | + | ||
2160 | + {CC"fieldOffset", CC"(" FLD ")I", FN_PTR(Unsafe_FieldOffset)}, | ||
2161 | + {CC"staticFieldBase", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, | ||
2162 | + {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2163 | + {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2164 | + {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2165 | {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, | ||
2166 | {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, | ||
2167 | |||
2168 | - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, | ||
2169 | - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2170 | - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2171 | - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2172 | - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2173 | - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)} | ||
2174 | + {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, | ||
2175 | + {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2176 | + {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2177 | + {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2178 | + {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2179 | + {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)} | ||
2180 | }; | ||
2181 | |||
2182 | // These are the methods prior to the JSR 166 changes in 1.5.0 | ||
2183 | static JNINativeMethod methods_141[] = { | ||
2184 | - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, | ||
2185 | - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, | ||
2186 | + {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, | ||
2187 | + {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, | ||
2188 | |||
2189 | DECLARE_GETSETOOP_141(Boolean, Z), | ||
2190 | DECLARE_GETSETOOP_141(Byte, B), | ||
2191 | @@ -1470,37 +1470,37 @@ static JNINativeMethod methods_141[] = { | ||
2192 | DECLARE_GETSETNATIVE(Float, F), | ||
2193 | DECLARE_GETSETNATIVE(Double, D), | ||
2194 | |||
2195 | - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2196 | - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2197 | + {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2198 | + {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2199 | |||
2200 | - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2201 | - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2202 | - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2203 | - | ||
2204 | - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, | ||
2205 | - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, | ||
2206 | - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, | ||
2207 | - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2208 | - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2209 | - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2210 | + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2211 | + {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2212 | + {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2213 | + | ||
2214 | + {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, | ||
2215 | + {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, | ||
2216 | + {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, | ||
2217 | + {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2218 | + {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2219 | + {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2220 | {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, | ||
2221 | {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, | ||
2222 | |||
2223 | - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, | ||
2224 | - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2225 | - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2226 | - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2227 | - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2228 | - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)} | ||
2229 | + {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, | ||
2230 | + {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2231 | + {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2232 | + {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2233 | + {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2234 | + {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)} | ||
2235 | |||
2236 | }; | ||
2237 | |||
2238 | // These are the methods prior to the JSR 166 changes in 1.6.0 | ||
2239 | static JNINativeMethod methods_15[] = { | ||
2240 | - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, | ||
2241 | - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, | ||
2242 | - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, | ||
2243 | - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, | ||
2244 | + {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, | ||
2245 | + {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, | ||
2246 | + {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, | ||
2247 | + {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, | ||
2248 | |||
2249 | |||
2250 | DECLARE_GETSETOOP(Boolean, Z), | ||
2251 | @@ -1520,42 +1520,42 @@ static JNINativeMethod methods_15[] = { | ||
2252 | DECLARE_GETSETNATIVE(Float, F), | ||
2253 | DECLARE_GETSETNATIVE(Double, D), | ||
2254 | |||
2255 | - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2256 | - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2257 | + {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2258 | + {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2259 | |||
2260 | - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2261 | - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2262 | - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2263 | - | ||
2264 | - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, | ||
2265 | - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, | ||
2266 | - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, | ||
2267 | - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2268 | - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2269 | - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2270 | + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2271 | + {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2272 | + {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2273 | + | ||
2274 | + {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, | ||
2275 | + {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, | ||
2276 | + {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, | ||
2277 | + {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2278 | + {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2279 | + {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2280 | {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, | ||
2281 | {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, | ||
2282 | |||
2283 | - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, | ||
2284 | - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2285 | - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2286 | - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2287 | - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2288 | - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, | ||
2289 | - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, | ||
2290 | - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, | ||
2291 | - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, | ||
2292 | + {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, | ||
2293 | + {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2294 | + {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2295 | + {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2296 | + {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2297 | + {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}, | ||
2298 | + {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, | ||
2299 | + {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, | ||
2300 | + {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, | ||
2301 | {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, | ||
2302 | - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} | ||
2303 | + {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} | ||
2304 | |||
2305 | }; | ||
2306 | |||
2307 | // These are the methods for 1.6.0 and 1.7.0 | ||
2308 | static JNINativeMethod methods_16[] = { | ||
2309 | - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, | ||
2310 | - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, | ||
2311 | - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, | ||
2312 | - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, | ||
2313 | + {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, | ||
2314 | + {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, | ||
2315 | + {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, | ||
2316 | + {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, | ||
2317 | |||
2318 | DECLARE_GETSETOOP(Boolean, Z), | ||
2319 | DECLARE_GETSETOOP(Byte, B), | ||
2320 | @@ -1574,45 +1574,45 @@ static JNINativeMethod methods_16[] = { | ||
2321 | DECLARE_GETSETNATIVE(Float, F), | ||
2322 | DECLARE_GETSETNATIVE(Double, D), | ||
2323 | |||
2324 | - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2325 | - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2326 | + {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2327 | + {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2328 | |||
2329 | - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2330 | - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2331 | - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2332 | - | ||
2333 | - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, | ||
2334 | - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, | ||
2335 | - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, | ||
2336 | - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2337 | - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2338 | - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2339 | + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2340 | + {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2341 | + {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2342 | + | ||
2343 | + {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, | ||
2344 | + {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, | ||
2345 | + {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, | ||
2346 | + {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2347 | + {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2348 | + {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2349 | {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, | ||
2350 | {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, | ||
2351 | |||
2352 | - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, | ||
2353 | - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2354 | - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2355 | - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2356 | - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2357 | - {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, | ||
2358 | - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, | ||
2359 | - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, | ||
2360 | - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, | ||
2361 | - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, | ||
2362 | - {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, | ||
2363 | - {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, | ||
2364 | - {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, | ||
2365 | + {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, | ||
2366 | + {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2367 | + {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2368 | + {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2369 | + {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2370 | + {CC"tryMonitorEnter", CC"(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, | ||
2371 | + {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}, | ||
2372 | + {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, | ||
2373 | + {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, | ||
2374 | + {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, | ||
2375 | + {CC"putOrderedObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)}, | ||
2376 | + {CC"putOrderedInt", CC"(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)}, | ||
2377 | + {CC"putOrderedLong", CC"(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, | ||
2378 | {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, | ||
2379 | - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} | ||
2380 | + {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} | ||
2381 | }; | ||
2382 | |||
2383 | // These are the methods for 1.8.0 | ||
2384 | static JNINativeMethod methods_18[] = { | ||
2385 | - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, | ||
2386 | - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, | ||
2387 | - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, | ||
2388 | - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, | ||
2389 | + {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, | ||
2390 | + {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, | ||
2391 | + {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, | ||
2392 | + {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, | ||
2393 | |||
2394 | DECLARE_GETSETOOP(Boolean, Z), | ||
2395 | DECLARE_GETSETOOP(Byte, B), | ||
2396 | @@ -1631,36 +1631,36 @@ static JNINativeMethod methods_18[] = { | ||
2397 | DECLARE_GETSETNATIVE(Float, F), | ||
2398 | DECLARE_GETSETNATIVE(Double, D), | ||
2399 | |||
2400 | - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2401 | - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2402 | + {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, | ||
2403 | + {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, | ||
2404 | |||
2405 | - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2406 | - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2407 | - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2408 | - | ||
2409 | - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, | ||
2410 | - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, | ||
2411 | - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, | ||
2412 | - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2413 | - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2414 | - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2415 | + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, | ||
2416 | + {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, | ||
2417 | + {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, | ||
2418 | + | ||
2419 | + {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, | ||
2420 | + {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, | ||
2421 | + {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, | ||
2422 | + {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, | ||
2423 | + {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, | ||
2424 | + {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, | ||
2425 | {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, | ||
2426 | {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, | ||
2427 | |||
2428 | - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2429 | - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2430 | - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2431 | - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2432 | - {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, | ||
2433 | - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, | ||
2434 | - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, | ||
2435 | - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, | ||
2436 | - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, | ||
2437 | - {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, | ||
2438 | - {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, | ||
2439 | - {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, | ||
2440 | + {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, | ||
2441 | + {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, | ||
2442 | + {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, | ||
2443 | + {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, | ||
2444 | + {CC"tryMonitorEnter", CC"(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, | ||
2445 | + {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}, | ||
2446 | + {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, | ||
2447 | + {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, | ||
2448 | + {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, | ||
2449 | + {CC"putOrderedObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)}, | ||
2450 | + {CC"putOrderedInt", CC"(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)}, | ||
2451 | + {CC"putOrderedLong", CC"(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, | ||
2452 | {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, | ||
2453 | - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} | ||
2454 | + {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} | ||
2455 | }; | ||
2456 | |||
2457 | JNINativeMethod loadavg_method[] = { | ||
2458 | @@ -1668,28 +1668,28 @@ JNINativeMethod loadavg_method[] = { | ||
2459 | }; | ||
2460 | |||
2461 | JNINativeMethod prefetch_methods[] = { | ||
2462 | - {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, | ||
2463 | - {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}, | ||
2464 | - {CC"prefetchReadStatic", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, | ||
2465 | - {CC"prefetchWriteStatic",CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)} | ||
2466 | + {CC"prefetchRead", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, | ||
2467 | + {CC"prefetchWrite", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)}, | ||
2468 | + {CC"prefetchReadStatic", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, | ||
2469 | + {CC"prefetchWriteStatic",CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)} | ||
2470 | }; | ||
2471 | |||
2472 | JNINativeMethod memcopy_methods_17[] = { | ||
2473 | - {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)}, | ||
2474 | - {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)} | ||
2475 | + {CC"copyMemory", CC"(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)}, | ||
2476 | + {CC"setMemory", CC"(" OBJ "JJB)V", FN_PTR(Unsafe_SetMemory2)} | ||
2477 | }; | ||
2478 | |||
2479 | JNINativeMethod memcopy_methods_15[] = { | ||
2480 | - {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, | ||
2481 | - {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)} | ||
2482 | + {CC"setMemory", CC"(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, | ||
2483 | + {CC"copyMemory", CC"(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)} | ||
2484 | }; | ||
2485 | |||
2486 | JNINativeMethod anonk_methods[] = { | ||
2487 | - {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, | ||
2488 | + {CC"defineAnonymousClass", CC"(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, | ||
2489 | }; | ||
2490 | |||
2491 | JNINativeMethod lform_methods[] = { | ||
2492 | - {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, | ||
2493 | + {CC"shouldBeInitialized",CC"(" CLS ")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, | ||
2494 | }; | ||
2495 | |||
2496 | JNINativeMethod fence_methods[] = { | ||
2497 | --- hotspot/src/share/vm/prims/whitebox.cpp.orig | ||
2498 | +++ hotspot/src/share/vm/prims/whitebox.cpp | ||
2499 | @@ -166,8 +166,8 @@ WB_END | ||
2500 | |||
2501 | WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) { | ||
2502 | CollectorPolicy * p = Universe::heap()->collector_policy(); | ||
2503 | - gclog_or_tty->print_cr("Minimum heap "SIZE_FORMAT" Initial heap " | ||
2504 | - SIZE_FORMAT" Maximum heap "SIZE_FORMAT" Min alignment "SIZE_FORMAT" Max alignment "SIZE_FORMAT, | ||
2505 | + gclog_or_tty->print_cr("Minimum heap " SIZE_FORMAT " Initial heap " | ||
2506 | + SIZE_FORMAT " Maximum heap " SIZE_FORMAT " Min alignment " SIZE_FORMAT " Max alignment " SIZE_FORMAT, | ||
2507 | p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(), | ||
2508 | p->space_alignment(), p->heap_alignment()); | ||
2509 | } | ||
2510 | @@ -202,8 +202,8 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(J | ||
2511 | Universe::narrow_oop_use_implicit_null_checks() )) { | ||
2512 | tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n " | ||
2513 | "\tUseCompressedOops is %d\n" | ||
2514 | - "\trhs.base() is "PTR_FORMAT"\n" | ||
2515 | - "\tUniverse::narrow_oop_base() is "PTR_FORMAT"\n" | ||
2516 | + "\trhs.base() is " PTR_FORMAT "\n" | ||
2517 | + "\tUniverse::narrow_oop_base() is " PTR_FORMAT "\n" | ||
2518 | "\tUniverse::narrow_oop_use_implicit_null_checks() is %d", | ||
2519 | UseCompressedOops, | ||
2520 | rhs.base(), | ||
2521 | @@ -256,8 +256,8 @@ static jint wb_stress_virtual_space_resi | ||
2522 | |||
2523 | WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o, | ||
2524 | jlong reserved_space_size, jlong magnitude, jlong iterations)) | ||
2525 | - tty->print_cr("reservedSpaceSize="JLONG_FORMAT", magnitude="JLONG_FORMAT", " | ||
2526 | - "iterations="JLONG_FORMAT"\n", reserved_space_size, magnitude, | ||
2527 | + tty->print_cr("reservedSpaceSize=" JLONG_FORMAT ", magnitude=" JLONG_FORMAT ", " | ||
2528 | + "iterations=" JLONG_FORMAT "\n", reserved_space_size, magnitude, | ||
2529 | iterations); | ||
2530 | if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) { | ||
2531 | tty->print_cr("One of variables printed above is negative. Can't proceed.\n"); | ||
2532 | --- hotspot/src/share/vm/runtime/safepoint.cpp.orig | ||
2533 | +++ hotspot/src/share/vm/runtime/safepoint.cpp | ||
2534 | @@ -918,7 +918,7 @@ void ThreadSafepointState::restart() { | ||
2535 | |||
2536 | case _running: | ||
2537 | default: | ||
2538 | - tty->print_cr("restart thread "INTPTR_FORMAT" with state %d", | ||
2539 | + tty->print_cr("restart thread " INTPTR_FORMAT " with state %d", | ||
2540 | _thread, _type); | ||
2541 | _thread->print(); | ||
2542 | ShouldNotReachHere(); | ||
2543 | @@ -1275,14 +1275,14 @@ void SafepointSynchronize::print_stat_on | ||
2544 | |||
2545 | for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) { | ||
2546 | if (_safepoint_reasons[index] != 0) { | ||
2547 | - tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index), | ||
2548 | + tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index), | ||
2549 | _safepoint_reasons[index]); | ||
2550 | } | ||
2551 | } | ||
2552 | |||
2553 | tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint", | ||
2554 | _coalesced_vmop_count); | ||
2555 | - tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms", | ||
2556 | + tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms", | ||
2557 | _max_sync_time / MICROUNITS); | ||
2558 | tty->print_cr("Maximum vm operation time (except for Exit VM operation) " | ||
2559 | INT64_FORMAT_W(5)" ms", | ||
2560 | --- hotspot/src/share/vm/services/threadService.cpp.orig | ||
2561 | +++ hotspot/src/share/vm/services/threadService.cpp | ||
2562 | @@ -889,7 +889,7 @@ void DeadlockCycle::print_on(outputStrea | ||
2563 | st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor); | ||
2564 | oop obj = (oop)waitingToLockMonitor->object(); | ||
2565 | if (obj != NULL) { | ||
2566 | - st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj, | ||
2567 | + st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj, | ||
2568 | (InstanceKlass::cast(obj->klass()))->external_name()); | ||
2569 | |||
2570 | if (!currentThread->current_pending_monitor_is_from_java()) { | ||
2571 | --- hotspot/src/share/vm/trace/traceStream.hpp.orig | ||
2572 | +++ hotspot/src/share/vm/trace/traceStream.hpp | ||
2573 | @@ -40,31 +40,31 @@ class TraceStream : public StackObj { | ||
2574 | TraceStream(outputStream& stream): _st(stream) {} | ||
2575 | |||
2576 | void print_val(const char* label, u1 val) { | ||
2577 | - _st.print("%s = "UINT32_FORMAT, label, val); | ||
2578 | + _st.print("%s = " UINT32_FORMAT, label, val); | ||
2579 | } | ||
2580 | |||
2581 | void print_val(const char* label, u2 val) { | ||
2582 | - _st.print("%s = "UINT32_FORMAT, label, val); | ||
2583 | + _st.print("%s = " UINT32_FORMAT, label, val); | ||
2584 | } | ||
2585 | |||
2586 | void print_val(const char* label, s2 val) { | ||
2587 | - _st.print("%s = "INT32_FORMAT, label, val); | ||
2588 | + _st.print("%s = " INT32_FORMAT, label, val); | ||
2589 | } | ||
2590 | |||
2591 | void print_val(const char* label, u4 val) { | ||
2592 | - _st.print("%s = "UINT32_FORMAT, label, val); | ||
2593 | + _st.print("%s = " UINT32_FORMAT, label, val); | ||
2594 | } | ||
2595 | |||
2596 | void print_val(const char* label, s4 val) { | ||
2597 | - _st.print("%s = "INT32_FORMAT, label, val); | ||
2598 | + _st.print("%s = " INT32_FORMAT, label, val); | ||
2599 | } | ||
2600 | |||
2601 | void print_val(const char* label, u8 val) { | ||
2602 | - _st.print("%s = "UINT64_FORMAT, label, val); | ||
2603 | + _st.print("%s = " UINT64_FORMAT, label, val); | ||
2604 | } | ||
2605 | |||
2606 | void print_val(const char* label, s8 val) { | ||
2607 | - _st.print("%s = "INT64_FORMAT, label, (int64_t) val); | ||
2608 | + _st.print("%s = " INT64_FORMAT, label, (int64_t) val); | ||
2609 | } | ||
2610 | |||
2611 | void print_val(const char* label, bool val) { | ||
2612 | --- hotspot/src/share/vm/utilities/ostream.cpp.orig | ||
2613 | +++ hotspot/src/share/vm/utilities/ostream.cpp | ||
2614 | @@ -277,7 +277,7 @@ void outputStream::print_data(void* data | ||
2615 | size_t limit = (len + 16) / 16 * 16; | ||
2616 | for (size_t i = 0; i < limit; ++i) { | ||
2617 | if (i % 16 == 0) { | ||
2618 | - indent().print(SIZE_FORMAT_HEX_W(07)":", i); | ||
2619 | + indent().print(SIZE_FORMAT_HEX_W(07) ":", i); | ||
2620 | } | ||
2621 | if (i % 2 == 0) { | ||
2622 | print(" "); | ||
2623 | @@ -945,7 +945,7 @@ void defaultStream::start_log() { | ||
2624 | // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if | ||
2625 | // we ever get round to introduce that method on the os class | ||
2626 | xs->head("hotspot_log version='%d %d'" | ||
2627 | - " process='%d' time_ms='"INT64_FORMAT"'", | ||
2628 | + " process='%d' time_ms='" INT64_FORMAT "'", | ||
2629 | LOG_MAJOR_VERSION, LOG_MINOR_VERSION, | ||
2630 | os::current_process_id(), (int64_t)time_ms); | ||
2631 | // Write VM version header immediately. | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch deleted file mode 100644 index 38f5f9b..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | --- jdk/make/GenerateSources.gmk.orig | ||
2 | +++ jdk/make/GenerateSources.gmk | ||
3 | @@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows) | ||
4 | GENSRC += $(GENSRC_OSX_ICONS) | ||
5 | endif | ||
6 | |||
7 | - ifneq ($(OPENJDK_TARGET_OS), macosx) | ||
8 | - include gensrc/GensrcX11Wrappers.gmk | ||
9 | - GENSRC += $(GENSRC_X11WRAPPERS) | ||
10 | + ifndef BUILD_HEADLESS_ONLY | ||
11 | + ifneq ($(OPENJDK_TARGET_OS), macosx) | ||
12 | + include gensrc/GensrcX11Wrappers.gmk | ||
13 | + GENSRC += $(GENSRC_X11WRAPPERS) | ||
14 | + endif | ||
15 | endif | ||
16 | endif | ||
17 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-restrict-to-staging-dir.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-restrict-to-staging-dir.patch deleted file mode 100644 index d33dc96..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-restrict-to-staging-dir.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- hotspot/make/linux/makefiles/dtrace.make.orig 2015-09-01 08:00:59.737868760 +0200 | ||
2 | +++ hotspot/make/linux/makefiles/dtrace.make 2015-09-01 08:01:24.049859677 +0200 | ||
3 | @@ -40,7 +40,7 @@ | ||
4 | ifneq ($(ALT_SDT_H),) | ||
5 | SDT_H_FILE = $(ALT_SDT_H) | ||
6 | else | ||
7 | - SDT_H_FILE = /usr/include/sys/sdt.h | ||
8 | + SDT_H_FILE = $(SYS_ROOT)/usr/include/sys/sdt.h | ||
9 | endif | ||
10 | DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) | ||
11 | REASON = "$(SDT_H_FILE) not found" | ||