diff options
155 files changed, 2433 insertions, 4799 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..5420797 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,50 @@ +meta-java contribution guidelines +================================= + +Contributing via GitLab.com +--------------------------- + +To contribute to this layer you may fork the repository and create a merge +request at https://gitlab.com/meta-java/meta-java. + +Please refer to: https://docs.gitlab.com/ee/user/project/merge_requests/ +for more information on merge requests in GitLab. + +Contributing via E-Mail +----------------------- + +To contribute to this layer you may submit the patches for review to the +mailing list (openembedded-devel@lists.openembedded.org). + +Please refer to: +https://wiki.yoctoproject.org/wiki/Contribution_Guidelines#General_Information + +for some useful guidelines to be followed when submitting patches. + +Mailing list: + + http://lists.openembedded.org/mailman/listinfo/openembedded-devel + +Source code: + + git://git.yoctoproject.org/meta-java + http://git.yoctoproject.org/git/meta-java + +When creating single patches, please use something like: + + git format-patch -M -s --subject-prefix='meta-java][PATCH' -1 + +When creating a patch series, please add a cover letter describing it shortly. +Therefore use something like: + + git format-patch -M -s --cover-letter --subject-prefix='meta-java][PATCH' origin + +When sending patches, please use something like: + + git send-email --to openembedded-devel@lists.openembedded.org <generated patch(es)> + +Please add the main layer maintainers to CC: + + Henning Heinold <henning@itconsulting-heinold.de> + Otavio Salvador <otavio@ossystems.com.br> + Richard Leitner <richard.leitner@skidata.com> @@ -11,51 +11,21 @@ branch: master revision: HEAD URI: git://git.openembedded.org/meta-openembedded +sub-layer: meta-oe branch: master revision: HEAD -For use with a specific Yocto Project release please refer to the corresponding -git branches. - -Contributing ------------- - -To contribute to this layer you should submit the patches for review to the -mailing list (openembedded-devel@lists.openembedded.org). - -Please refer to: -https://wiki.yoctoproject.org/wiki/Contribution_Guidelines#General_Information - -for some useful guidelines to be followed when submitting patches. - -Mailing list: - - http://lists.openembedded.org/mailman/listinfo/openembedded-devel - -Source code: - - git://git.yoctoproject.org/meta-java - http://git.yoctoproject.org/git/meta-java +Furthermoe for oeqa runtime testing this layer depends on: -When creating single patches, please use something like: - - git format-patch -M -s --subject-prefix='meta-java][PATCH' -1 - -When creating a patch series, please add a cover letter describing it shortly. -Therefore use something like: - - git format-patch -M -s --cover-letter --subject-prefix='meta-java][PATCH' origin - -When sending patches, please use something like: - - git send-email --to openembedded-devel@lists.openembedded.org <generated patch(es)> +URI: git://git.yoctoproject.org/poky +sub-layer: meta-poky +branch: master +revision: HEAD -Main layer maintainers: +For use with a specific Yocto Project release please refer to the corresponding +git branches. - Henning Heinold <henning@itconsulting-heinold.de> - Maxin John <maxin.john@intel.com> - Otavio Salvador <otavio@ossystems.com.br> - Richard Leitner <richard.leitner@skidata.com> +Guides on how to contribute to meta-java are described in CONTRIBUTING.md. Testing ------- @@ -64,6 +34,7 @@ The meta-java layer may be tested using oeqa's runtime image tests. The easiest way is to add the following configuration to your local.conf: SANITY_TESTED_DISTROS = "" +INHERIT += "testimage" TESTIMAGE_AUTO = "1" Then you should be able to use the open{jre,jdk}-{7,8}-test-image recipes. @@ -124,5 +95,5 @@ BBLAYERS ?= " \ Build host dependencies ----------------------- - - gcc with c++14 support + - gcc >= v6 - libstdc++ static diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index e0159ba..67541d2 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass @@ -17,6 +17,7 @@ PACKAGE_ARCH ?= "all" # Fully expanded - so it applies the overrides as well PACKAGE_ARCH_EXPANDED := "${PACKAGE_ARCH}" inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED') == 'all', 'allarch', '')} +inherit python3native # use java_stage for native packages JAVA_NATIVE_STAGE_INSTALL = "1" @@ -27,8 +28,8 @@ def java_package_name(d): pre="" post="" - bpn = d.getVar('BPN', True) - ml = d.getVar('MLPREFIX', True) + bpn = d.getVar('BPN') + ml = d.getVar('MLPREFIX') if not bpn.startswith("lib"): pre='lib' @@ -39,11 +40,11 @@ def java_package_name(d): JPN ?= "${@java_package_name(d)}" -DEPENDS_prepend = "virtual/javac-native fastjar-native " +DEPENDS:prepend = "virtual/javac-native fastjar-native " PACKAGES += "${JPN}" -FILES_${JPN} = "${datadir_java}" +FILES:${JPN} = "${datadir_java}" # File name of the libraries' main Jar file JARFILENAME = "${BP}.jar" @@ -53,15 +54,15 @@ ALTJARFILENAMES = "${BPN}.jar" # Java "source" distributions often contain precompiled things # we want to delete first. -do_removebinaries() { +do_deletebinaries() { find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \ -name "*.jar" -exec rm {} \; find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \ -name "*.class" -exec rm {} \; } -addtask removebinaries after do_unpack before do_patch +addtask deletebinaries after do_unpack before do_patch -do_install_append() { +do_install:append() { oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} } diff --git a/classes/java-native.bbclass b/classes/java-native.bbclass deleted file mode 100644 index cade7b1..0000000 --- a/classes/java-native.bbclass +++ /dev/null @@ -1,9 +0,0 @@ -# This is to be used by recipes which rely on java-library.bbclass -# infrastructure and are a *-native recipe which needs to install -# jar files into staging. -# -# This class has nothing to do with Java's JNI. - -inherit native - -NATIVE_INSTALL_WORKS = "1" diff --git a/classes/java.bbclass b/classes/java.bbclass index fc97295..1574452 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -80,8 +80,6 @@ oe_makeclasspath() { # in variable "bootcp". # # Provide the -s at the beginning otherwise strange things happen. - # If -s is given the function checks whether the requested jar file exists - # and exits with an error message if it cannot be found. # # Note: In order to encourage usage of the DEPENDS variable, the function # can accept recipe names. If a recipe has no corresponding Jar file it @@ -91,6 +89,7 @@ oe_makeclasspath() { classpath= delimiter= retval=$1 + staging=false shift @@ -106,6 +105,7 @@ oe_makeclasspath() { dir=${STAGING_DATADIR_JAVA} ;; esac + staging=true ;; -*) bbfatal "oe_makeclasspath: unknown option: $1" @@ -113,9 +113,9 @@ oe_makeclasspath() { *) file=$dir/$1.jar - if [ -e $file ]; then - classpath=$classpath$delimiter$file - delimiter=":" + if [ $staging = false ] || [ -e $file ]; then + classpath=$classpath$delimiter$file + delimiter=":" fi ;; diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass index 01ed591..1aeca8d 100644 --- a/classes/openjdk-build-helper.bbclass +++ b/classes/openjdk-build-helper.bbclass @@ -2,14 +2,14 @@ # passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are # parallelizable and we need ${PARALLEL_MAKE} to derive the proper value. # The base for this quirk is that GNU Make only considers the last "-j" option. -EXTRA_OEMAKE_remove_task-compile = "${PARALLEL_MAKE}" -EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}" +EXTRA_OEMAKE:remove:task-compile = "${PARALLEL_MAKE}" +EXTRA_OEMAKE:remove:task-install = "${PARALLEL_MAKEINST}" # OpenJDK supports parallel compilation but uses a plain number for this. # In OE we have PARALLEL_MAKE which is the actual option passed to make, # e.g. "-j 4". def openjdk_build_helper_get_parallel_make(d): - pm = d.getVar('PARALLEL_MAKE', True); + pm = d.getVar('PARALLEL_MAKE'); if not pm or '-j' not in pm: return 1 @@ -31,7 +31,7 @@ def openjdk_build_helper_get_build_cflags(d): from subprocess import Popen, PIPE cmd = d.expand('%s -dumpversion' % build_cc).split() cc = Popen(cmd, stdout=PIPE, stderr=PIPE) - return cc.communicate()[0].decode('utf-8')[0] + return cc.communicate()[0].decode('utf-8').split()[0] build_cc = d.getVar('BUILD_CC') version = get_build_cc_version(build_cc) @@ -45,7 +45,7 @@ def openjdk_build_helper_get_target_cflags(d): # doesn't work anyway. version = d.getVar('GCCVERSION')[0] # skip non digit characters at the beginning, e.g. from "linaro-6.2%" - match = re.search("\d", version) + match = re.search(r"\d", version) if match: version = version[match.start():] return openjdk_build_helper_get_cflags_by_cc_version(d, version) @@ -55,7 +55,7 @@ def openjdk_build_helper_get_target_cflags(d): def openjdk_build_helper_get_jdk_arch(d): import bb - jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) + jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH') if jdk_arch == "x86-64": jdk_arch = "amd64" elif jdk_arch == "powerpc": @@ -73,7 +73,7 @@ def openjdk_build_helper_get_jdk_arch(d): def openjdk_build_helper_get_llvm_configure_arch(d): import bb; - arch = d.getVar('TRANSLATED_TARGET_ARCH', True) + arch = d.getVar('TRANSLATED_TARGET_ARCH') if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']: arch = "x86" elif arch in ['mipsel', 'mips']: @@ -83,8 +83,8 @@ def openjdk_build_helper_get_llvm_configure_arch(d): elif arch == "arm": arch = "arm" else: - if 'shark' in d.getVar('PACKAGECONFIG').split(): - bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN', True), arch) ); + if bb.utils.contains('PACKAGECONFIG', 'shark', True, False, d): + bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) ); return arch @@ -93,7 +93,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d): def openjdk_build_helper_get_icedtea_arch(d): import bb; - arch = d.getVar('TRANSLATED_TARGET_ARCH', True) + arch = d.getVar('TRANSLATED_TARGET_ARCH') if arch == "x86-64": arch = "amd64" elif arch in ['i386', 'i486', 'i586', 'i686']: diff --git a/classes/openjdk-test-image.bbclass b/classes/openjdk-test-image.bbclass index f6e4fca..47ad4bb 100644 --- a/classes/openjdk-test-image.bbclass +++ b/classes/openjdk-test-image.bbclass @@ -1,5 +1,5 @@ DESCRIPTION = "An image for OpenJDK testing purposes" -TEST_SUITES_append = " javac" +TEST_SUITES:append = " javac" inherit openjre-test-image diff --git a/classes/openjre-test-image.bbclass b/classes/openjre-test-image.bbclass index 77dbd74..9562be4 100644 --- a/classes/openjre-test-image.bbclass +++ b/classes/openjre-test-image.bbclass @@ -4,6 +4,6 @@ IMAGE_FEATURES += "ssh-server-openssh package-management" IMAGE_INSTALL = "${CORE_IMAGE_BASE_INSTALL}" -DEFAULT_TEST_SUITES_pn-${PN} = "ping ssh java" +DEFAULT_TEST_SUITES:pn-${PN} = "ping ssh java" inherit core-image diff --git a/conf/layer.conf b/conf/layer.conf index 90236be..71d6a10 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,10 +7,13 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-java" BBFILE_PATTERN_meta-java := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-java = "10" -LAYERSERIES_COMPAT_meta-java = "thud warrior" +LAYERSERIES_COMPAT_meta-java = "scarthgap" +LAYERDEPENDS_meta-java += "openembedded-layer" LICENSE_PATH += "${LAYERDIR}/licenses" +HOSTTOOLS_NONFATAL += "free" + SIGGEN_EXCLUDERECIPES_ABISAFE += "\ ca-certificates-java \ " diff --git a/docs/UPDATING.md b/docs/UPDATING.md new file mode 100644 index 0000000..9e02cd1 --- /dev/null +++ b/docs/UPDATING.md @@ -0,0 +1,16 @@ +# HowTo Update OpenJDK 8 # + +1. Determine latest ga version: + curl -s "https://hg.openjdk.java.net/jdk8u/jdk8u/tags" | grep -m 1 "jdk8u.*ga" | sed 's/-ga$//g' +2. Rename OpenJDK/OpenJRE bb files to the matching release version +3. Adapt the CHANGESET_ID for aarch32 based on: + curl -s https://hg.openjdk.java.net/aarch32-port/jdk8u/tags | grep "jdk8u.*ga-aarch32-" | head +4. Adapt the CHANGESET_ID for aarch64 based on: + curl -s https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/tags | grep "aarch64-shenandoah-jdk8u.*-" | head +5. Adapt source archive checksums by executing the script + ./docs/update8checksums.sh +6. Check if any patch got upstreamed (and remove if so) +7. Re-apply all other patches and format them again + for git: git format-patch --src-prefix=a/y/ --dst-prefix=b/y/ -n --start-number=x jdk8uXXX-ga +8. Test for x86_64, aarch32 & aarch64 (at least using testimage in qemu) +9. Send a patch ;-) diff --git a/docs/update8checksums.sh b/docs/update8checksums.sh new file mode 100755 index 0000000..ccf68d1 --- /dev/null +++ b/docs/update8checksums.sh @@ -0,0 +1,64 @@ +#!/bin/bash +# +# quick-hack-script for updating the openjdk 8 source archive checksums +# +#set -x +set -e + +function updateChecksums() { + echo "updating ${ARCH} checksums..." + for repo in ${REPOS}; do + repoDL="/${repo}" + [ "${repo}" == "openjdk" ] && repoDL="" + echo -n " ${ARCH}/${repo}." + wget -q "${BASEURL}${repoDL}/archive/${TAG}.tar.bz2" -O "${tmpfile}" + echo -n "." + md5="$(md5sum "${tmpfile}" | cut -d " " -f1)" + echo -n "." + sha="$(sha256sum "${tmpfile}" | cut -d " " -f1)" + echo -n "." + sed -i "s|^SRC_URI\\[${repo}.md5sum\\].*\$|SRC_URI\\[${repo}.md5sum\\] = \\\"${md5}\\\"|g" "${INCFILE}" + sed -i "s|^SRC_URI\\[${repo}.sha256sum\\].*\$|SRC_URI\\[${repo}.sha256sum\\] = \\\"${sha}\\\"|g" "${INCFILE}" + echo " done" + done +} + +REPOS="corba hotspot jaxp jaxws jdk langtools nashorn openjdk" +OPENJDK_UPDATE="$(basename "$(ls -1 recipes-core/openjdk/openjdk-8_*.bb)" | cut -d _ -f2 | cut -d . -f1)" + +COMMON_BASEURL="https://hg.openjdk.java.net/jdk8u/jdk8u" +COMMON_TAG="jdk8u${OPENJDK_UPDATE}-ga" + +AARCH32_BASEURL="https://hg.openjdk.java.net/aarch32-port/jdk8u" +AARCH32_CHANGESET_ID="$(grep "^CHANGESET_ID" recipes-core/openjdk/openjdk-8-release-aarch32.inc | cut -d= -f2 | tr -d \")" +AARCH32_TAG="jdk8u${OPENJDK_UPDATE}-${AARCH32_CHANGESET_ID}" + +AARCH64_BASEURL="https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" +AARCH64_CHANGESET_ID="$(grep "^CHANGESET_ID" recipes-core/openjdk/openjdk-8-release-aarch64.inc | cut -d= -f2 | tr -d \")" +AARCH64_TAG="aarch64-shenandoah-jdk8u${OPENJDK_UPDATE}-${AARCH64_CHANGESET_ID}" + +echo "meta-java openjdk8 source archive checksum update script" + +tmpfile="$(mktemp)" + +ARCH="common" +BASEURL="${COMMON_BASEURL}" +TAG="${COMMON_TAG}" +INCFILE="recipes-core/openjdk/openjdk-8-release.inc" +updateChecksums + +ARCH="aarch32" +BASEURL="${AARCH32_BASEURL}" +TAG="${AARCH32_TAG}" +INCFILE="recipes-core/openjdk/openjdk-8-release-aarch32.inc" +updateChecksums + +ARCH="aarch64" +BASEURL="${AARCH64_BASEURL}" +TAG="${AARCH64_TAG}" +INCFILE="recipes-core/openjdk/openjdk-8-release-aarch64.inc" +updateChecksums + +rm -f "${tmpfile}" + +echo "SUCCESS" diff --git a/lib/oeqa/runtime/cases/java.py b/lib/oeqa/runtime/cases/java.py index c1e1498..d366d61 100644 --- a/lib/oeqa/runtime/cases/java.py +++ b/lib/oeqa/runtime/cases/java.py @@ -20,6 +20,7 @@ class JavaTest(OERuntimeTestCase): cls.tc.target.run('rm %s' % dst) @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(["openjdk-7-jre", "openjdk-7", "openjre-8", "openjdk-8"]) def test_java_exists(self): status, output = self.target.run('which java') msg = 'java binary not in PATH or not on target.' diff --git a/lib/oeqa/runtime/cases/javac.py b/lib/oeqa/runtime/cases/javac.py index 39ae298..3f11511 100644 --- a/lib/oeqa/runtime/cases/javac.py +++ b/lib/oeqa/runtime/cases/javac.py @@ -18,12 +18,16 @@ class JavacTest(OERuntimeTestCase): dst = '/tmp/test.java /tmp/test.class' cls.tc.target.run('rm %s' % dst) + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(["openjdk-7", "openjdk-8"]) @OETestDepends(['java.JavaTest.test_java_exists']) def test_javac_exists(self): status, output = self.target.run('which javac') msg = 'javac binary not in PATH or not on target.' self.assertEqual(status, 0, msg=msg) + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(["openjdk-7", "openjdk-8"]) @OETestDepends(['javac.JavacTest.test_javac_exists']) def test_javac_works(self): status, output = self.target.run('javac /tmp/test.java') diff --git a/recipes-core/ant-contrib/ant-contrib-native_1.0b3.bb b/recipes-core/ant-contrib/ant-contrib-native_1.0b3.bb index 2a44ea2..db79626 100644 --- a/recipes-core/ant-contrib/ant-contrib-native_1.0b3.bb +++ b/recipes-core/ant-contrib/ant-contrib-native_1.0b3.bb @@ -12,7 +12,7 @@ DEPENDS = "ant-native commons-cli-native commons-codec-native \ oro-native bcel-native xerces-j-native \ " -inherit java-library java-native +inherit java-library native SRC_URI = "${SOURCEFORGE_MIRROR}/ant-contrib/ant-contrib-${PV}-src.zip" diff --git a/recipes-core/ant/ant-native_1.8.1.bb b/recipes-core/ant/ant-native_1.8.1.bb index 5a39f42..8814039 100644 --- a/recipes-core/ant/ant-native_1.8.1.bb +++ b/recipes-core/ant/ant-native_1.8.1.bb @@ -11,7 +11,7 @@ SRC_URI = "http://archive.apache.org/dist/ant/source/apache-ant-${PV}-src.tar.gz S = "${WORKDIR}/apache-ant-${PV}" -inherit java-library java-native +inherit java-library native DEPENDS = " \ jsch-native bsf-native xalan-j-native xerces-j-native \ @@ -20,7 +20,7 @@ DEPENDS = " \ junit-native jdepend-native commons-net-native commons-logging-native \ " -do_removecruft() { +do_deletecruft() { # Removes thing that need proprietary Jar files or are otherwise problematic rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/image rm -rf ${S}/src/main/org/apache/tools/ant/types/optional/image @@ -30,7 +30,7 @@ do_removecruft() { rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java } -addtask removecruft before do_patch after do_removebinaries +addtask deletecruft before do_patch after do_deletebinaries do_compile() { mkdir -p build @@ -57,7 +57,7 @@ do_compile() { sed -i -e"s|@JAR_FILE@|$cp|" ${WORKDIR}/ant } -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/ant ${D}${bindir} } diff --git a/recipes-core/antlr/antlr_2.7.7.bb b/recipes-core/antlr/antlr_2.7.7.bb index d2453a9..d744201 100644 --- a/recipes-core/antlr/antlr_2.7.7.bb +++ b/recipes-core/antlr/antlr_2.7.7.bb @@ -5,11 +5,11 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=361934e706423915b4d9f413ad37fb65" SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz" -SRC_URI_append_class-native = " file://runantlr" +SRC_URI:append:class-native = " file://runantlr" inherit java-library -do_configure_class-native() { +do_configure:class-native() { sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr } @@ -21,7 +21,7 @@ do_compile() { fastjar cf ${JARFILENAME} -C build . } -do_install_class-native() { +do_install:class-native() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/runantlr ${D}${bindir}/ } diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend deleted file mode 100644 index 4651185..0000000 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -do_install_append() { - cat >> ${D}${sysconfdir}/profile << EOT -JAVA_HOME="" -for dir in ${libdir}/jvm/*; do - if [ -x "\${dir}/bin/java" ]; then - [ -z "\${JAVA_HOME}" ] && JAVA_HOME="\${dir}" - fi -done -if [ -n "\${JAVA_HOME}" ]; then - export JAVA_HOME=\${JAVA_HOME} -fi -EOT -} diff --git a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb index feaa7dc..2405b30 100644 --- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb +++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb @@ -17,7 +17,7 @@ DEPENDS = "virtual/javac-native fastjar-native" PACKAGE_WRITE_DEPS += "openjdk-8-native" SRC_URI = "\ - git://salsa.debian.org/java-team/ca-certificates-java.git \ + git://salsa.debian.org/java-team/ca-certificates-java.git;branch=master;protocol=https \ file://0001-UpdateCertificates-handle-SYSROOT-environment-variab.patch \ file://${BPN}.hook.in \ " @@ -37,7 +37,7 @@ python () { raise bb.parse.SkipRecipe("PREFERRED_RPROVIDER_java2-runtime '%s' unsupported" % runtime) } -do_patch_append () { +do_patch:append () { bb.build.exec_func('do_fix_sysconfdir', d) } @@ -78,7 +78,7 @@ do_install () { ${D}${sbindir}/create-ca-certificates-java } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -n "$D" ] ; then # In this case we want to use the Java in the image recipe's # native sysroot (native Java, not qemu target Java) to @@ -98,10 +98,9 @@ pkg_postinst_${PN} () { JVM_LIBDIR=$JVM_LIBDIR $D${sbindir}/create-ca-certificates-java } -RDEPENDS_${PN} = "ca-certificates" -RDEPENDS_${PN}_append_class-target = " java2-runtime" -RDEPENDS_${PN}_append_class-native = " virtual/java-native" +RDEPENDS:${PN} = "ca-certificates" +RDEPENDS:${PN}:append:class-target = " java2-runtime" -FILES_${PN} += "${datadir_java}" +FILES:${PN} += "${datadir_java}" BBCLASSEXTEND = "native" diff --git a/recipes-core/cacao/cacao-initial-native_0.98.bb b/recipes-core/cacao/cacao-initial-native_0.98.bb index 8125e88..8432456 100644 --- a/recipes-core/cacao/cacao-initial-native_0.98.bb +++ b/recipes-core/cacao/cacao-initial-native_0.98.bb @@ -6,7 +6,7 @@ SECTION = "interpreters" PROVIDES = "virtual/java-initial-native" -inherit native autotools-brokensep +inherit autotools-brokensep native DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial-native jikes-initial-native" @@ -35,7 +35,7 @@ export JAVAC="jikes-initial" # enforces the usage of fastjar export JAR="fastjar" -do_configure_append() { +do_configure:append() { # Fix the executable name in the wrapper script. sed -i -e "s|exec cacao \\$|exec cacao-initial \\$|" src/scripts/java.in } diff --git a/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch b/recipes-core/cacao/cacao/0001-java.in-Do-not-use-hardcode-paths.patch index 2b046cf..521814e 100644 --- a/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch +++ b/recipes-core/cacao/cacao/0001-java.in-Do-not-use-hardcode-paths.patch @@ -1,25 +1,31 @@ -java.in: Do not use hardcode paths +From 51a63cdac93caf69d1b6ace40f73f6147ba37de5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> +Date: Thu, 20 Aug 2020 13:48:38 +0200 +Subject: [PATCH 1/2] java.in: Do not use hardcode paths +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Cacao uses hardcoded paths to various files, if these paths are not provided. This causes issues when sharing sstate with otherwise identical workers, if build time paths are not identical. -Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> - Upstream-Status: Inappropriate [Yocto-specific fixes] +Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - cacao-1.6.1/src/scripts/java.in | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) + src/scripts/java.in | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) -diff --git cacao-1.6.1/src/scripts/java.in cacao-1.6.1/src/scripts/java.in -index 0790f02..2118de7 100644 ---- cacao-1.6.1/src/scripts/java.in -+++ cacao-1.6.1/src/scripts/java.in -@@ -22,5 +22,17 @@ +diff --git a/src/scripts/java.in b/src/scripts/java.in +index 0790f0255..a4f16ecdc 100644 +--- a/src/scripts/java.in ++++ b/src/scripts/java.in +@@ -22,5 +22,16 @@ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301, USA. - + -IFS="" -exec $(dirname ${0})/cacao ${1+"$@"} +SH_DIR=`dirname "$0"` @@ -27,15 +33,14 @@ index 0790f02..2118de7 100644 + +# if this shell script is invoked through symlink, we get invalid paths. As getting the real path to this file is +# very painful using only /bin/sh, python is used instead. -+PYTHON_STR="import os; print os.path.dirname(os.path.realpath(os.readlink(\"${CURRENT_DIR}/java\"))) if os.path.islink(\"${CURRENT_DIR}/java\") else \"${CURRENT_DIR}\"" -+REAL_DIR=`python -c "${PYTHON_STR}"` ++PYTHON_STR="import os; print(os.path.dirname(os.path.realpath(os.readlink(\"${CURRENT_DIR}/java\"))) if os.path.islink(\"${CURRENT_DIR}/java\") else \"${CURRENT_DIR}\")" ++REAL_DIR=`python3 -c "${PYTHON_STR}"` + +PARENT_DIR=`dirname ${REAL_DIR}` + +export BOOTCLASSPATH="${PARENT_DIR}/share/cacao/vm.zip:${PARENT_DIR}/share/classpath/glibj.zip" +LIBRARY_PATH="-Djava.library.path=${PARENT_DIR}/lib/classpath" +exec ${REAL_DIR}/cacao ${LIBRARY_PATH} ${1+"$@"} -+ --- -2.7.4 +-- +2.28.0 diff --git a/recipes-core/cacao/cacao-2d6f6c14daf9/system-boehm-gc.patch b/recipes-core/cacao/cacao/0002-cacao-use-system-s-boehm-garbage-collector.patch index c30f5be..102e9a7 100644 --- a/recipes-core/cacao/cacao-2d6f6c14daf9/system-boehm-gc.patch +++ b/recipes-core/cacao/cacao/0002-cacao-use-system-s-boehm-garbage-collector.patch @@ -1,4 +1,7 @@ -cacao: use system's boehm garbage collector +From 7833101c8c8938d58a32e355b9af1b56e4229a87 Mon Sep 17 00:00:00 2001 +From: Hugo Vasconcelos Saldanha <hugo.saldanha@aker.com.br> +Date: Thu, 20 Aug 2020 13:50:47 +0200 +Subject: [PATCH 2/2] cacao: use system's boehm garbage collector This is a Gentoo's patch [1] to force the use of system's bdwgc. @@ -10,11 +13,17 @@ with the system's version. Upstream-Status: Inappropriate [not author] Signed-off-by: Hugo Vasconcelos Saldanha <hugo.saldanha@aker.com.br> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + configure.ac | 8 ++------ + src/mm/Makefile.am | 9 ++++----- + 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac +index aceb2033b..db8a9770e 100644 --- a/configure.ac +++ b/configure.ac -@@ -691,6 +691,8 @@ +@@ -738,6 +738,8 @@ AC_CHECK_ENABLE_GCC_PR40134 AC_CHECK_ENABLE_PIC_ASM @@ -23,7 +32,7 @@ diff --git a/configure.ac b/configure.ac dnl Define version numbers. AC_VERSION_DETAIL AC_VERSION_CONFIG -@@ -793,12 +795,6 @@ +@@ -855,12 +857,6 @@ AC_CONFIG_FILES([Makefile] ) @@ -37,9 +46,10 @@ diff --git a/configure.ac b/configure.ac diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am +index 9d0945a29..cbd7dc963 100644 --- a/src/mm/Makefile.am +++ b/src/mm/Makefile.am -@@ -35,14 +35,13 @@ +@@ -35,14 +35,13 @@ GC_FILE = \ endif if ENABLE_GC_BOEHM @@ -58,3 +68,6 @@ diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am endif if ENABLE_GC_CACAO +-- +2.28.0 + diff --git a/recipes-core/cacao/cacao_2d6f6c14daf9.bb b/recipes-core/cacao/cacao_git.bb index 6783894..fef7f34 100644 --- a/recipes-core/cacao/cacao_2d6f6c14daf9.bb +++ b/recipes-core/cacao/cacao_git.bb @@ -4,27 +4,25 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "interpreters" -DEPENDS_class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-initial-native classpath-native bdwgc-native virtual/java-initial-native" -PROVIDES_class-native = "virtual/java-native" +DEPENDS:class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-initial-native classpath-native bdwgc-native virtual/java-initial-native" +PROVIDES:class-native = "virtual/java-native" DEPENDS = "zlib libtool classpath virtual/javac-native bdwgc" -RPROVIDES_${PN} = "java2-runtime" +RPROVIDES:${PN} = "java2-runtime" -SRC_URI = "https://bitbucket.org/cacaovm/cacao-staging/get/${PV}.zip \ - file://system-boehm-gc.patch \ - file://cacao-1.6.1-do-not-rely-on-absolute-paths.patch \ +SRCREV = "6c4694f9bd175386a8c451531e9a5ad97aa23b6f" +SRC_URI = "git://bitbucket.org/cacaovm/cacao.git;protocol=https;branch=master \ + file://0001-java.in-Do-not-use-hardcode-paths.patch \ + file://0002-cacao-use-system-s-boehm-garbage-collector.patch \ " -S = "${WORKDIR}/cacaovm-cacao-staging-${PV}" +S = "${WORKDIR}/git" -SRC_URI[md5sum] = "5157d0bb9eb1332f7a6b6186eaac01aa" -SRC_URI[sha256sum] = "34b51d660d69c2a83225fd75eab5e1fac002fb5974cb4a74b7478baf923a76cd" - -inherit java autotools-brokensep update-alternatives pkgconfig distro_features_check +inherit java autotools-brokensep update-alternatives pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" -REQUIRED_DISTRO_FEATURES_class-native := "" +REQUIRED_DISTRO_FEATURES:class-native := "" -EXTRA_OECONF_class-native = "\ +EXTRA_OECONF:class-native = "\ --enable-debug \ --with-vm-zip=${datadir}/cacao/vm.zip \ --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ @@ -35,7 +33,7 @@ EXTRA_OECONF_class-native = "\ --disable-libjvm \ " -CACHED_CONFIGUREVARS_class-native += "ac_cv_prog_JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial" +CACHED_CONFIGUREVARS:class-native += "ac_cv_prog_JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial" EXTRA_OECONF = "\ --with-vm-zip=${datadir}/cacao/vm.zip \ @@ -48,21 +46,21 @@ EXTRA_OECONF = "\ --disable-test-dependency-checks \ " -do_configure_prepend () { +do_configure:prepend () { # upgrade m4 macros in source tree libtoolize --force --copy --install rm -f src/mm/boehm-gc/ltmain.sh mkdir -p src/mm/boehm-gc/m4 } -do_install_append_class-target() { +do_install:append:class-target() { rm ${D}/${bindir}/java } -FILES_${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}" -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*" -FILES_${PN}-doc += "${datadir}/gc" +FILES:${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}" +FILES:${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*" +FILES:${PN}-doc += "${datadir}/gc" BBCLASSEXTEND = "native" -COMPATIBLE_MACHINE_aarch64 = "-" +COMPATIBLE_MACHINE:aarch64 = "-" diff --git a/recipes-core/classpath/classpath-0.99/0001-Fix-bad-implementation-of-compareTo-in-BigDecimal.patch b/recipes-core/classpath/classpath-0.99/0001-Fix-bad-implementation-of-compareTo-in-BigDecimal.patch new file mode 100644 index 0000000..35fb81e --- /dev/null +++ b/recipes-core/classpath/classpath-0.99/0001-Fix-bad-implementation-of-compareTo-in-BigDecimal.patch @@ -0,0 +1,68 @@ +From b561cdb6f3fef251696216775c775f84369278cc Mon Sep 17 00:00:00 2001 +From: Chris Laplante <chris.laplante@agilent.com> +Date: Wed, 2 Oct 2019 21:38:11 -0400 +Subject: [PATCH 1/2] Fix bad implementation of compareTo in BigDecimal + +Prior to this patch compareTo couldn't handle operands with negative +scales. It passes the following unit test from JDK8: +http://hg.openjdk.java.net/jdk8/jdk8/jdk/file/tip/test/java/math/BigDecimal/CompareToTests.java + +Upstream-Status: Inappropriate [dead project] + +Signed-off-by: Chris Laplante <chris.laplante@agilent.com> +--- + java/math/BigDecimal.java | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +diff --git a/java/math/BigDecimal.java b/java/math/BigDecimal.java +index 7f4546c..e14d894 100644 +--- a/java/math/BigDecimal.java ++++ b/java/math/BigDecimal.java +@@ -861,26 +861,30 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> + if (scale == val.scale) + return intVal.compareTo (val.intVal); + +- BigInteger thisParts[] = +- intVal.divideAndRemainder (BigInteger.TEN.pow (scale)); +- BigInteger valParts[] = +- val.intVal.divideAndRemainder (BigInteger.TEN.pow (val.scale)); ++ BigInteger[] thisParts = new BigInteger[2]; ++ BigInteger[] valParts = new BigInteger[2]; ++ ++ if (scale > 0) ++ thisParts = intVal.divideAndRemainder (BigInteger.TEN.pow (scale)); ++ else ++ { ++ thisParts[0] = intVal.multiply (BigInteger.TEN.pow (-scale)); ++ thisParts[1] = BigInteger.ZERO; ++ } ++ ++ if (val.scale > 0) ++ valParts = val.intVal.divideAndRemainder (BigInteger.TEN.pow (val.scale)); ++ else ++ { ++ valParts[0] = val.intVal.multiply (BigInteger.TEN.pow (-val.scale)); ++ valParts[1] = BigInteger.ZERO; ++ } + + int compare; + if ((compare = thisParts[0].compareTo (valParts[0])) != 0) + return compare; + + // quotients are the same, so compare remainders +- +- // Add some trailing zeros to the remainder with the smallest scale +- if (scale < val.scale) +- thisParts[1] = thisParts[1].multiply +- (BigInteger.valueOf (10).pow (val.scale - scale)); +- else if (scale > val.scale) +- valParts[1] = valParts[1].multiply +- (BigInteger.valueOf (10).pow (scale - val.scale)); +- +- // and compare them + return thisParts[1].compareTo (valParts[1]); + } + +-- +2.7.4 + diff --git a/recipes-core/classpath/classpath-0.99/0002-Fix-BigDecimal.stripTrailingZeros-s-handling-of-0.patch b/recipes-core/classpath/classpath-0.99/0002-Fix-BigDecimal.stripTrailingZeros-s-handling-of-0.patch new file mode 100644 index 0000000..645b010 --- /dev/null +++ b/recipes-core/classpath/classpath-0.99/0002-Fix-BigDecimal.stripTrailingZeros-s-handling-of-0.patch @@ -0,0 +1,51 @@ +From 14fa6fc320eb84d0adb9ae00dd66ddb1caaae2a6 Mon Sep 17 00:00:00 2001 +From: Chris Laplante <chris.laplante@agilent.com> +Date: Wed, 2 Oct 2019 21:46:01 -0400 +Subject: [PATCH 2/2] Fix BigDecimal.stripTrailingZeros()'s handling of 0. + +Previously, 'new BigDecimal("0").stripTrailingZeros()' would blow up: + +Caused by: java.lang.StringIndexOutOfBoundsException: String index out of range: -1 + at java.lang.String.charAt + at java.math.BigDecimal.stripTrailingZeros + +Fixes https://sourceforge.net/p/saxon/mailman/message/27204592/ + +Upstream-Status: Inappropriate [dead project] + +Signed-off-by: Chris Laplante <chris.laplante@agilent.com> +--- + java/math/BigDecimal.java | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/java/math/BigDecimal.java b/java/math/BigDecimal.java +index e14d894..5e30f1c 100644 +--- a/java/math/BigDecimal.java ++++ b/java/math/BigDecimal.java +@@ -1335,17 +1335,22 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> + */ + public BigDecimal stripTrailingZeros() + { ++ if (intVal.intValue() == 0) ++ return ZERO; ++ + String intValStr = intVal.toString(); + int newScale = scale; + int pointer = intValStr.length() - 1; ++ + // This loop adjusts pointer which will be used to give us the substring + // of intValStr to use in our new BigDecimal, and also accordingly + // adjusts the scale of our new BigDecimal. +- while (intValStr.charAt(pointer) == '0') ++ while (pointer >= 0 && intValStr.charAt(pointer) == '0') + { + pointer --; + newScale --; + } ++ + // Create a new BigDecimal with the appropriate substring and then + // set its scale. + BigDecimal result = new BigDecimal(intValStr.substring(0, pointer + 1)); +-- +2.7.4 + diff --git a/recipes-core/classpath/classpath-features-check.inc b/recipes-core/classpath/classpath-features-check.inc new file mode 100644 index 0000000..c238fc3 --- /dev/null +++ b/recipes-core/classpath/classpath-features-check.inc @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +inherit features_check +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/recipes-core/classpath/classpath-initial-native_0.93.bb b/recipes-core/classpath/classpath-initial-native_0.93.bb index 51229ec..7bb1ca1 100644 --- a/recipes-core/classpath/classpath-initial-native_0.93.bb +++ b/recipes-core/classpath/classpath-initial-native_0.93.bb @@ -28,7 +28,7 @@ EXTRA_OECONF += "\ # Ensure tools.zip is not installed at same path as classpath-native EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial" -do_install_append() { +do_install:append() { # remove files clashing with classpath-native in sysroot rm \ ${D}${bindir}/gappletviewer \ diff --git a/recipes-core/classpath/classpath-native.inc b/recipes-core/classpath/classpath-native.inc index b1de458..c81e064 100644 --- a/recipes-core/classpath/classpath-native.inc +++ b/recipes-core/classpath/classpath-native.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS = "fastjar-native zip-native" -inherit autotools native gettext +inherit autotools gettext native SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" diff --git a/recipes-core/classpath/classpath-native_0.99.bb b/recipes-core/classpath/classpath-native_0.99.bb index a1e1e0f..ecf8c0a 100644 --- a/recipes-core/classpath/classpath-native_0.99.bb +++ b/recipes-core/classpath/classpath-native_0.99.bb @@ -5,11 +5,13 @@ DEPENDS += "classpath-initial-native ecj-initial-native virtual/java-initial-nat PR = "${INC_PR}.0" SRC_URI += " \ - file://sun-security-getproperty.patch;striplevel=0 \ - file://ecj_java_dir.patch \ - file://autotools.patch \ - file://miscompilation.patch \ - file://toolwrapper-exithook.patch \ + file://sun-security-getproperty.patch;striplevel=0 \ + file://ecj_java_dir.patch \ + file://autotools.patch \ + file://miscompilation.patch \ + file://toolwrapper-exithook.patch \ + file://0001-Fix-bad-implementation-of-compareTo-in-BigDecimal.patch \ + file://0002-Fix-BigDecimal.stripTrailingZeros-s-handling-of-0.patch \ " SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" SRC_URI[sha256sum] = "f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8" @@ -21,7 +23,7 @@ EXTRA_OECONF += "\ --includedir=${STAGING_INCDIR}/classpath \ " -do_compile_append () { +do_compile:append () { # tools using java-initial rather than java sed it out cd tools sed -e "s/java-initial/java/g" \ diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc index e23b752..35e7db3 100644 --- a/recipes-core/classpath/classpath.inc +++ b/recipes-core/classpath/classpath.inc @@ -7,19 +7,19 @@ LICENSE = "GPL-2.0 & SAX-PD" PBN = "classpath" -inherit autotools java gettext +inherit autotools pkgconfig java gettext DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst file" -RPROVIDES_${PN} = "" +RPROVIDES:${PN} = "" -RDEPENDS_${PN} = "${PBN}-common (>= ${PV})" -RDEPENDS_${PN}-examples = "java2-runtime ${PN}-awt" -RDEPENDS_${PN}-tools = "java2-runtime" +RDEPENDS:${PN} = "${PBN}-common (>= ${PV})" +RDEPENDS:${PN}-examples = "java2-runtime ${PN}-awt" +RDEPENDS:${PN}-tools = "java2-runtime" -RPROVIDES_${PN} = "${PBN}" -RPROVIDES_${PN}-common = "${PBN}-common" -RPROVIDES_${PN}-gtk = "${PBN}-awt" +RPROVIDES:${PN} = "${PBN}" +RPROVIDES:${PN}-common = "${PBN}-common" +RPROVIDES:${PN}-gtk = "${PBN}-awt" PR = "r3" @@ -49,7 +49,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF += "\ " -do_configure_prepend () { +do_configure:prepend () { cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S} } @@ -60,7 +60,7 @@ do_install() { } # We really have valid non-symlink .so files -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" # Defines the packages that this classpath recipe creates. # This allows the classpath-minimal variants to override this @@ -71,20 +71,20 @@ CPPACKAGES = "${PBN}-common ${PN}-examples \ PACKAGES =+ "${CPPACKAGES}" -FILES_${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}" +FILES:${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}" -FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip ${libdir}/logging.properties ${libdir}/${PBN}/security" -FILES_${PN}-examples = "${datadir}/${PBN}/examples" +FILES:${PBN}-common = "${datadir}/${PBN}/glibj.zip ${libdir}/logging.properties ${libdir}/${PBN}/security" +FILES:${PN}-examples = "${datadir}/${PBN}/examples" -FILES_${PN}-tools = "${datadir}/${PBN}/tools.zip ${bindir}" -FILES_${PN}-tools-doc = "${mandir}" +FILES:${PN}-tools = "${datadir}/${PBN}/tools.zip ${bindir}" +FILES:${PN}-tools-doc = "${mandir}" -FILES_${PN}-dbg += "${libdir}/${PBN}/.debug" -FILES_${PN}-doc = "${infodir}" +FILES:${PN}-dbg += "${libdir}/${PBN}/.debug" +FILES:${PN}-doc = "${infodir}" # gcjwebplugin - not built yet #FILES_${PN}-gcjwebplugin = "${libdir}/${PBN}/libgcjwebplugin.so" -FILES_${PN}-gtk = "${libdir}/${PBN}/libgtkpeer.so ${libdir}/${PBN}/libjawt.so" -FILES_${PN}-gconf = "${libdir}/${PBN}/libgconfpeer.so" -FILES_${PN} = "${libdir}/${PBN}/lib*so*" +FILES:${PN}-gtk = "${libdir}/${PBN}/libgtkpeer.so ${libdir}/${PBN}/libjawt.so" +FILES:${PN}-gconf = "${libdir}/${PBN}/libgconfpeer.so" +FILES:${PN} = "${libdir}/${PBN}/lib*so*" diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index 714503a..f18ad1d 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb @@ -1,8 +1,6 @@ require classpath.inc -inherit distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" +include classpath-features-check.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=92acc79f1f429143f4624d07b253702a" diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb index 3ce5a21..ce81453 100644 --- a/recipes-core/cup/cup_0.10k.bb +++ b/recipes-core/cup/cup_0.10k.bb @@ -4,8 +4,8 @@ LICENSE = "CUP" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c33" -RDEPENDS_${PN} = "java2-runtime" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "java2-runtime" +RDEPENDS:${PN}:class-native = "" PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit java-library @@ -32,14 +32,14 @@ do_compile() { fastjar cf ${BP}.jar -C build . } -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/cup ${D}${bindir} } PACKAGES = "${PN}" -FILES_${PN} += "${datadir_java}" +FILES:${PN} += "${datadir_java}" SRC_URI[md5sum] = "8b11edfec13c590ea443d0f0ae0da479" SRC_URI[sha256sum] = "7e6dc5be74ae56c7e86e69ad0ad88dae3b2847afa9e73a76635918a6b1eb75cd" diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc index 04425f4..2f3cc97 100644 --- a/recipes-core/ecj/libecj-bootstrap.inc +++ b/recipes-core/ecj/libecj-bootstrap.inc @@ -9,7 +9,7 @@ DEPENDS = "classpath-initial-native fastjar-native jikes-initial-native virtual/ INC_PR = "r5" -inherit native java +inherit java native S = "${WORKDIR}" @@ -54,6 +54,7 @@ do_compile() { fastjar -c -C build . -f ${JAR} } +do_compile[vardepsexclude] += "BB_NUMBER_THREADS" do_install() { oe_jarinstall ${JAR} ecj-bootstrap.jar diff --git a/recipes-core/fastjar/fastjar.inc b/recipes-core/fastjar/fastjar.inc index 2a40e3c..8412236 100644 --- a/recipes-core/fastjar/fastjar.inc +++ b/recipes-core/fastjar/fastjar.inc @@ -12,15 +12,15 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.ta inherit autotools update-alternatives PACKAGES = "${PN}-grepjar ${PN} ${PN}-dbg ${PN}-doc" -FILES_${PN}-grepjar = "${bindir}/grepjar" +FILES:${PN}-grepjar = "${bindir}/grepjar" PROVIDES = "virtual/jar" -ALTERNATIVE_${PN} = "jar" +ALTERNATIVE:${PN} = "jar" ALTERNATIVE_LINK = "${bindir}/jar" ALTERNATIVE_TARGET = "${bindir}/fastjar" # update-aternatives does not work for native class -do_install_append_class-native () { +do_install:append:class-native () { ln -s fastjar ${D}${bindir}/jar } diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index b578cb2..d6f8fd7 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -12,24 +12,32 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ xorgproto-native libx11-native \ " -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" -CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" +CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" # Disable dead store elimination and set C++ standard to C++98. # There are dead stores in the JVM that would be pretty hard to # remove, so disable the optimisation in the compiler. -CFLAGS_append = " -fno-tree-dse" -CXXFLAGS_append = " -fno-tree-dse" -CXX_append = " -std=gnu++98" +CFLAGS:append = " -std=gnu++98 -fno-tree-dse -fno-tree-vectorize" +CXXFLAGS:append = " -std=gnu++98 -fno-tree-dse" # WORKAROUND: ignore errors from new compilers -CFLAGS_append = " -Wno-error=stringop-overflow -Wno-error=return-type" +CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type" -inherit native java autotools pkgconfig +# oe.utils.get_host_compiler_version returns "gcc, 9.2" and we want -> "9" +HOST_COMPILER_MAJOR="${@oe.utils.get_host_compiler_version(d)[1].split(".", 2)[0]}" +CFLAGS:append = " ${@oe.utils.less_or_equal('HOST_COMPILER_MAJOR', '8', '', ' -Wno-error=format-overflow', d)}" + +# Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources +CFLAGS:append = " -fcommon" + +inherit java autotools pkgconfig inherit openjdk-build-helper +inherit python3native +inherit native JAVA_HOME[unexport] = "1" @@ -57,55 +65,43 @@ B = "${S}/build" # openjdk looks in /usr/include and /usr/lib for freetype by default. export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" +export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" # libfreetype.so.6 is copied from STAGING_LIBDIR # which is already stripped. -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" EXTRA_OECONF = "\ - --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ - \ - --disable-tests \ - --disable-hotspot-tests \ - --disable-langtools-tests \ - --disable-jdk-tests \ - --disable-pulse-java \ - --disable-docs \ - --disable-nss \ - --disable-system-lcms \ - --disable-system-gtk \ - \ - --with-jdk-home=${WORKDIR}/fake-jdk \ - --with-javac=${STAGING_BINDIR_NATIVE}/javac \ - --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \ - \ - --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE} \ - --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE} \ - --with-corba-src-zip=${DL_DIR}/${CORBA_FILE} \ - --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE} \ - --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \ - --with-jdk-src-zip=${DL_DIR}/${JDK_FILE} \ - --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE} \ - ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ - " + --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ + --disable-tests \ + --disable-hotspot-tests \ + --disable-langtools-tests \ + --disable-jdk-tests \ + --disable-pulse-java \ + --disable-docs \ + --disable-nss \ + --disable-system-lcms \ + --disable-system-gtk \ + --with-jdk-home=${WORKDIR}/fake-jdk \ + --with-javac=${STAGING_BINDIR_NATIVE}/javac \ + --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \ + --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE_DOWNLOAD} \ + --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE_DOWNLOAD} \ + --with-corba-src-zip=${DL_DIR}/${CORBA_FILE_DOWNLOAD} \ + --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE_DOWNLOAD} \ + --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE_DOWNLOAD} \ + --with-jdk-src-zip=${DL_DIR}/${JDK_FILE_DOWNLOAD} \ + --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE_DOWNLOAD} \ + ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ +" JDK_DIR = "icedtea7-native" JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" -do_configure_prepend() { - case "${TRANSLATED_TARGET_ARCH}" in - x86-64) - libarch=amd64 - ;; - i386|i486|i586|i686) - libarch=x86 - ;; - *) - arch=${TARGET_ARCH} - libarch=${TARGET_ARCH} - ;; - esac +do_configure:prepend() { + arch="${@openjdk_build_helper_get_icedtea_arch(d)}" + libarch="${@openjdk_build_helper_get_icedtea_arch(d)}" # Automatically copy everything that starts with "icedtea" and ends with # ".patch" into the patches directory. @@ -134,7 +130,7 @@ do_configure_prepend() { POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" -do_configure_append() { +do_configure:append() { oe_runmake patch-fsg for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ; diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch new file mode 100644 index 0000000..bd2819f --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch @@ -0,0 +1,20 @@ +--- openjdk/hotspot/src/share/vm/code/relocInfo.hpp ++++ openjdk/hotspot/src/share/vm/code/relocInfo.hpp +@@ -371,7 +371,7 @@ + // "immediate" in the prefix header word itself. This optimization + // is invisible outside this module.) + +- inline friend relocInfo prefix_relocInfo(int datalen = 0); ++ inline friend relocInfo prefix_relocInfo(int datalen); + + protected: + // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value +@@ -466,7 +466,7 @@ + return relocInfo(relocInfo::none, relocInfo::offset_limit() - relocInfo::offset_unit); + } + +-inline relocInfo prefix_relocInfo(int datalen) { ++inline relocInfo prefix_relocInfo(int datalen = 0) { + assert(relocInfo::fits_into_immediate(datalen), "datalen in limits"); + return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen); + } diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-fix-xattr-include.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-fix-xattr-include.patch new file mode 100644 index 0000000..9b94dc8 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-fix-xattr-include.patch @@ -0,0 +1,11 @@ +--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c ++++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c +@@ -37,7 +37,7 @@ + + #ifdef COMPILE_AGAINST_SYSCALLS + #include <sys/types.h> +-#include <attr/xattr.h> ++#include <sys/xattr.h> + #else + #include <syscalls_fp.h> + #endif diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch new file mode 100644 index 0000000..1c7a585 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch @@ -0,0 +1,22 @@ +--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c +@@ -35,7 +35,7 @@ + #endif + #ifdef __linux__ + #include <unistd.h> +-#include <sys/sysctl.h> ++#include <linux/sysctl.h> + #include <sys/utsname.h> + #include <netinet/ip.h> + +--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c ++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c +@@ -43,7 +43,7 @@ + #endif + #ifdef __linux__ + #include <unistd.h> +-#include <sys/sysctl.h> ++#include <linux/sysctl.h> + #endif + + #include "jvm.h" diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-m4-fix-xattr-include-path.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-m4-fix-xattr-include-path.patch new file mode 100644 index 0000000..5164012 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-m4-fix-xattr-include-path.patch @@ -0,0 +1,11 @@ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2102,7 +2102,7 @@ + dnl Check for syscalls + AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],, + [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])]) +- AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h], ++ AC_CHECK_HEADERS([sys/epoll.h sys/xattr.h], + , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary.])]) + fi + AM_CONDITIONAL(USE_SYSCALL_COMPILATION, test x"${ENABLE_SYSCALL_COMPILATION}" = "xyes") diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc index 484f124..379fd9e 100644 --- a/recipes-core/icedtea/openjdk-7-release-03b147.inc +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc @@ -5,58 +5,66 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b147:" # Force arm mode for now -ARM_INSTRUCTION_SET_armv4t = "ARM" +ARM_INSTRUCTION_SET:armv4t = "ARM" -ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" +ICEDTEA_URI = "https://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" ICEDTEA_PREFIX = "icedtea7-forest-2.1" -ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}" +ICEDTEA_HG_URL = "https://icedtea.wildebeest.org/hg/release/${ICEDTEA_PREFIX}" OPENJDK_CHANGESET = "22cc03983e20" -OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" -OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false" +OPENJDK_FILE_UPSTREAM = "${OPENJDK_CHANGESET}.tar.bz2" +OPENJDK_FILE_DOWNLOAD = "openjdk-${OPENJDK_CHANGESET}.tar.bz2" +OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE_UPSTREAM};name=openjdk;unpack=false;downloadfilename=${OPENJDK_FILE_DOWNLOAD}" SRC_URI[openjdk.md5sum] = "f98b0f7a69f9427a5b3775dddddc89cb" SRC_URI[openjdk.sha256sum] = "758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e" HOTSPOT_CHANGESET = "8b7c4c5f6ba9" -HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.gz" -HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" +HOTSPOT_FILE_UPSTREAM = "${HOTSPOT_CHANGESET}.tar.gz" +HOTSPOT_FILE_DOWNLOAD = "hotspot-${HOTSPOT_CHANGESET}.tar.gz" +HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE_UPSTREAM};name=hotspot;unpack=false;downloadfilename=${HOTSPOT_FILE_DOWNLOAD}" SRC_URI[hotspot.md5sum] = "cb45a8f19d77acc1f4f48e75e36a27fe" SRC_URI[hotspot.sha256sum] = "22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2" CORBA_CHANGESET = "5617f6c5cc94" -CORBA_FILE = "${CORBA_CHANGESET}.tar.gz" -CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" +CORBA_FILE_UPSTREAM = "${CORBA_CHANGESET}.tar.gz" +CORBA_FILE_DOWNLOAD = "corba-${CORBA_CHANGESET}.tar.gz" +CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE_UPSTREAM};name=corba;unpack=false;downloadfilename=${CORBA_FILE_DOWNLOAD}" SRC_URI[corba.md5sum] = "920f1a788a7fdef29a5cd70892331251" SRC_URI[corba.sha256sum] = "963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3" JAXP_CHANGESET = "7a8825b15df6" -JAXP_FILE = "${JAXP_CHANGESET}.tar.gz" -JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" +JAXP_FILE_UPSTREAM = "${JAXP_CHANGESET}.tar.gz" +JAXP_FILE_DOWNLOAD = "jaxp-${JAXP_CHANGESET}.tar.gz" +JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE_UPSTREAM};name=jaxp;unpack=false;downloadfilename=${JAXP_FILE_DOWNLOAD}" SRC_URI[jaxp.md5sum] = "a0982b6df79739127871e355a40ca5a6" SRC_URI[jaxp.sha256sum] = "297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2" JAXWS_CHANGESET = "7edfbfe974f2" -JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz" -JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" +JAXWS_FILE_UPSTREAM = "${JAXWS_CHANGESET}.tar.gz" +JAXWS_FILE_DOWNLOAD = "jaxws-${JAXWS_CHANGESET}.tar.gz" +JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE_UPSTREAM};name=jaxws;unpack=false;downloadfilename=${JAXWS_FILE_DOWNLOAD}" SRC_URI[jaxws.md5sum] = "2deecec809ea8e38835678889c2bc3ac" SRC_URI[jaxws.sha256sum] = "823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa" JDK_CHANGESET = "d5ddeffc4651" -JDK_FILE = "${JDK_CHANGESET}.tar.gz" -JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" +JDK_FILE_UPSTREAM = "${JDK_CHANGESET}.tar.gz" +JDK_FILE_DOWNLOAD = "jdk-${JDK_CHANGESET}.tar.gz" +JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE_UPSTREAM};name=jdk;unpack=false;downloadfilename=${JDK_FILE_DOWNLOAD}" SRC_URI[jdk.md5sum] = "27c28d6be213df818490e69f12efe475" SRC_URI[jdk.sha256sum] = "e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98" LANGTOOLS_CHANGESET = "b534c4c6cd9b" -LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz" -LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" +LANGTOOLS_FILE_UPSTREAM = "${LANGTOOLS_CHANGESET}.tar.gz" +LANGTOOLS_FILE_DOWNLOAD = "langtools-${LANGTOOLS_CHANGESET}.tar.gz" +LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE_UPSTREAM};name=langtools;unpack=false;downloadfilename=${LANGTOOLS_FILE_DOWNLOAD}" SRC_URI[langtools.md5sum] = "16b72f3fea8ac4e5b50de693e87f9c53" SRC_URI[langtools.sha256sum] = "c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c" CACAO_VERSION = "a567bcb7f589" -CACAO_FILE = "${CACAO_VERSION}.tar.gz" -CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false" +CACAO_FILE_UPSTREAM = "${CACAO_VERSION}.tar.gz" +CACAO_FILE_DOWNLOAD = "cacao-${CACAO_VERSION}.tar.gz" +CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE_UPSTREAM};name=cacao;unpack=false;downloadfilename=${CACAO_FILE_DOWNLOAD}" SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73" SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9" @@ -72,6 +80,7 @@ ICEDTEA_PATCHES = " \ file://icedtea-sane-x86-arch-name.patch \ file://fix-checksums.patch \ file://icedtea-makefile-unzip.patch \ + file://icedtea-m4-fix-xattr-include-path.patch \ " OPENJDK_PATCHES = " \ @@ -80,6 +89,7 @@ OPENJDK_PATCHES = " \ file://icedtea-corba-parallel-make.patch;apply=no \ file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ file://icedtea-jdk-sane-x86-arch.patch;apply=no \ + file://icedtea-jdk-fix-xattr-include.patch;apply=no \ file://icedtea-flags.patch;apply=no \ file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no \ file://icedtea-change-to-gdb-debug-format.patch;apply=no \ @@ -90,6 +100,8 @@ OPENJDK_PATCHES = " \ file://icedtea-CVE-2014-1876-unpack.patch;apply=no \ file://icedtea-jdk-unzip.patch;apply=no \ file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \ + file://icedtea-hotspot-fix-prefix_relocInfo-declaration.patch;apply=no \ + file://icedtea-jdk-replace-sys-sysctl.patch;apply=no \ " OPENJDK_HEADLESS_PATCHES = " \ @@ -105,6 +117,7 @@ export DISTRIBUTION_PATCHES = " \ patches/icedtea-corba-parallel-make.patch \ patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ patches/icedtea-jdk-sane-x86-arch.patch \ + patches/icedtea-jdk-fix-xattr-include.patch \ patches/icedtea-flags.patch \ patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \ patches/icedtea-change-to-gdb-debug-format.patch \ @@ -113,9 +126,11 @@ export DISTRIBUTION_PATCHES = " \ patches/icedtea-CVE-2014-1876-unpack.patch \ patches/icedtea-jdk-unzip.patch \ patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \ + patches/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch \ + patches/icedtea-jdk-replace-sys-sysctl.patch \ ${CLEAN_X11_DISTRIBUTION_PATCH} \ " # readdir_r was deprecated in glibc-2.24. Ignore the error for now # NOTE: When updating the recipe, please check if this is still needed -CFLAGS_append = " -Wno-error=deprecated-declarations" +CFLAGS:append = " -Wno-error=deprecated-declarations" diff --git a/recipes-core/jacl/jacl_1.4.1.bb b/recipes-core/jacl/jacl_1.4.1.bb index d510cc8..2b811c7 100644 --- a/recipes-core/jacl/jacl_1.4.1.bb +++ b/recipes-core/jacl/jacl_1.4.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ HOMEPAGE = "http://sourceforge.net/projects/tcljava" -SRC_URI = "http://downloads.sourceforge.net/tcljava/jacl${PV}.tar.gz" +SRC_URI = "https://downloads.sourceforge.net/tcljava/jacl${PV}.tar.gz" inherit java-library diff --git a/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb b/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb index 06287f6..2c5ecc2 100644 --- a/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb +++ b/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Static utility methods useful in manipulating Java classes that c SRC_URI = "http://www.apache.org/dist/commons/beanutils/source/${BP}-src.tar.gz" DEPENDS += "commons-collections3 commons-logging" -RDEPENDS_${PN} = "libcommons-collections3-java libcommons-logging-java" +RDEPENDS:${PN} = "libcommons-collections3-java libcommons-logging-java" CP = "commons-collections3 commons-logging" diff --git a/recipes-core/jakarta-commons/commons-configuration_1.5.bb b/recipes-core/jakarta-commons/commons-configuration_1.5.bb deleted file mode 100644 index 0f8a166..0000000 --- a/recipes-core/jakarta-commons/commons-configuration_1.5.bb +++ /dev/null @@ -1,28 +0,0 @@ -require jakarta-commons.inc - -PR = "${INC_PR}.1" - -SUMMARY = "Generic configuration interface for Java applications" - -SRC_URI = " \ - http://archive.apache.org/dist/commons/configuration/source/${BP}-src.tar.gz;name=archive \ - http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2;name=ant \ - " - -PNBLACKLIST[commons-configuration] ?= "BROKEN: indirectly depends on broken 'xom'" - -DEPENDS += "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet2.4" -RDEPENDS_${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libcommons-codec-java libcommons-digester-java libcommons-jxpath-java libcommons-lang-java libservlet2.4-java" - -CP = "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet-api-2.4" - -# Makes use of -sourcepath hack: We inject Ant sourcefiles into the build and remove them -# afterwards. -COMPILE_SOURCEPATH = "${WORKDIR}/apache-ant-1.7.1/src/main:src/java" - -CLEAN_PATH = "build/org/apache/tools" - -SRC_URI[archive.md5sum] = "6a019d26d576a87eda2ef84c8ffc2e31" -SRC_URI[archive.sha256sum] = "06e5dd81c1302118298156f70b8138fa131ed8f258671b1b67e36a34d80357a0" -SRC_URI[ant.md5sum] = "0d68db4a1ada5c91bcbf53cefd0c2fd7" -SRC_URI[ant.sha256sum] = "4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6" diff --git a/recipes-core/jakarta-commons/commons-digester_1.8.bb b/recipes-core/jakarta-commons/commons-digester_1.8.bb index 0f079f1..de264b8 100644 --- a/recipes-core/jakarta-commons/commons-digester_1.8.bb +++ b/recipes-core/jakarta-commons/commons-digester_1.8.bb @@ -7,7 +7,7 @@ SUMMARY = "Converts XML to a Java object by a set of mapping rules." SRC_URI = "http://archive.apache.org/dist/commons/digester/source/${BP}-src.tar.gz" DEPENDS += "commons-logging commons-beanutils" -RDEPENDS_${PN} = "libcommons-logging-java libcommons-beanutils-java" +RDEPENDS:${PN} = "libcommons-logging-java libcommons-beanutils-java" CP = "commons-logging commons-beanutils" diff --git a/recipes-core/jakarta-commons/commons-discovery_0.4.bb b/recipes-core/jakarta-commons/commons-discovery_0.4.bb index 01cb54e..aa87349 100644 --- a/recipes-core/jakarta-commons/commons-discovery_0.4.bb +++ b/recipes-core/jakarta-commons/commons-discovery_0.4.bb @@ -8,7 +8,7 @@ SUMMARY = "discovering, or finding, implementations for pluggable interfaces" SRC_URI = "http://archive.apache.org/dist/commons/discovery/source/${BP}-src.tar.gz" DEPENDS += "commons-logging" -RDEPENDS_${PN} = "libcommons-logging-java" +RDEPENDS:${PN} = "libcommons-logging-java" CP = "commons-logging" diff --git a/recipes-core/jakarta-commons/commons-el_1.0.bb b/recipes-core/jakarta-commons/commons-el_1.0.bb index 4174dce..bb4c35b 100644 --- a/recipes-core/jakarta-commons/commons-el_1.0.bb +++ b/recipes-core/jakarta-commons/commons-el_1.0.bb @@ -8,7 +8,7 @@ SUMMARY = "Implementation of the JSP2.0 Expression Language API" SRC_URI = "http://archive.apache.org/dist/commons/el/source/${BP}-src.tar.gz" DEPENDS += "jsp2.0 servlet2.4" -RDEPENDS_${PN} = "libjsp2.0-java libservlet2.4-java" +RDEPENDS:${PN} = "libjsp2.0-java libservlet2.4-java" CP = "jsp-api-2.0 servlet-api-2.4" diff --git a/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb b/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb index dab7996..395fa15 100644 --- a/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb +++ b/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Robust, high-performance, file upload capability for Java servlet SRC_URI = "http://archive.apache.org/dist/commons/fileupload/source/${BP}-src.tar.gz" DEPENDS += "commons-beanutils commons-io servlet2.3" -RDEPENDS_${PN} = "libcommons-beanutils-java libcommons-io-java libservlet2.3-java" +RDEPENDS:${PN} = "libcommons-beanutils-java libcommons-io-java libservlet2.3-java" CP = "commons-beanutils commons-io servlet-2.3" diff --git a/recipes-core/jakarta-commons/commons-httpclient_3.1.bb b/recipes-core/jakarta-commons/commons-httpclient_3.1.bb index 8daed1b..a6fb53b 100644 --- a/recipes-core/jakarta-commons/commons-httpclient_3.1.bb +++ b/recipes-core/jakarta-commons/commons-httpclient_3.1.bb @@ -10,8 +10,8 @@ SRC_URI = "http://archive.apache.org/dist/httpcomponents/commons-httpclient/sour S = "${WORKDIR}/${BP}" DEPENDS += "commons-logging commons-codec" -RDEPENDS_${PN} = "libcommons-logging-java libcommons-codec-java" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "libcommons-logging-java libcommons-codec-java" +RDEPENDS:${PN}:class-native = "" CP = "commons-logging commons-codec" diff --git a/recipes-core/jakarta-commons/commons-jxpath_1.3.bb b/recipes-core/jakarta-commons/commons-jxpath_1.3.bb deleted file mode 100644 index 3561444..0000000 --- a/recipes-core/jakarta-commons/commons-jxpath_1.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -require jakarta-commons.inc - -PR = "${INC_PR}.1" - -SUMMARY = "JXPath interpreter for Java" - -SRC_URI = "http://archive.apache.org/dist/commons/jxpath/source/${BP}-src.tar.gz" - -PNBLACKLIST[commons-jxpath] ?= "BROKEN: indirectly depends on broken 'xom'" - -DEPENDS += "commons-logging commons-collections3 commons-beanutils servlet2.3 jdom" -RDEPENDS_${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libservlet2.3-java libjdom-java" - -CP = "commons-logging commons-collections3 commons-beanutils servlet-2.3 jdom" - -SRC_URI[md5sum] = "9af6ed5d009061986d709a370829860e" -SRC_URI[sha256sum] = "da314198d75c6da660e2603bd1543a8f5d0b640c5144b748e62e59afc278efe6" diff --git a/recipes-core/jakarta-commons/commons-net_1.4.1.bb b/recipes-core/jakarta-commons/commons-net_1.4.1.bb index 5737c46..ba62ebc 100644 --- a/recipes-core/jakarta-commons/commons-net_1.4.1.bb +++ b/recipes-core/jakarta-commons/commons-net_1.4.1.bb @@ -11,8 +11,8 @@ S = "${WORKDIR}/${BP}" DEPENDS += "oro" -RDEPENDS_${PN} = "liboro-java" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "liboro-java" +RDEPENDS:${PN}:class-native = "" CP = "oro" diff --git a/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb b/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb index 081cfe7..c6d8374 100644 --- a/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb +++ b/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r1" SRC_URI = " \ - http://archive.apache.org/dist/excalibur/avalon-framework/source/${BP}-src.tar.gz;name=archive \ - http://archive.apache.org/dist/avalon/logkit/source/logkit-1.2.2-src.tar.gz;name=logkit \ + https://archive.apache.org/dist/excalibur/excalibur-framework/source/${BP}-src.tar.gz;name=archive \ + https://archive.apache.org/dist/avalon/logkit/source/logkit-1.2.2-src.tar.gz;name=logkit \ " inherit java-library diff --git a/recipes-core/jakarta-libs/bsf_2.4.0.bb b/recipes-core/jakarta-libs/bsf_2.4.0.bb index a79cbf4..22d9320 100644 --- a/recipes-core/jakarta-libs/bsf_2.4.0.bb +++ b/recipes-core/jakarta-libs/bsf_2.4.0.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" PR = "r2" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3" -SRC_URI = "http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.gz" +SRC_URI = "https://dlcdn.apache.org/commons/bsf/source/bsf-src-${PV}.tar.gz" PACKAGE_ARCH = "${TUNE_PKGARCH}" diff --git a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb index bf005db..7773409 100644 --- a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb +++ b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb @@ -1,6 +1,6 @@ SUMMARY = "A compact Java Virtual Machine which conforms to the JVM specification version 2." HOMEPAGE = "http://jamvm.sourceforge.net/" -LICENSE = "GPL" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "zlib-native classpath-initial-native jikes-initial-native libffi-native" @@ -20,7 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" -inherit native autotools pkgconfig +inherit autotools pkgconfig native # libdir must be modified so that jamvm-initial and -native # do not interfere @@ -38,7 +38,7 @@ CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB" EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/jikes-initial \ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-inital/glibj.zip \ " -do_install_append() { +do_install:append() { install -d ${D}${bindir}/ install -m 0755 ${WORKDIR}/java-initial ${D}${bindir}/ } diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index cdf087e..693817f 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -4,56 +4,56 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native" -DEPENDS_class-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" +DEPENDS:class-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" -RDEPENDS_${PN} = "classpath" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "classpath" +RDEPENDS:${PN}:class-native = "" -PROVIDES_class-native = "virtual/java-native" -RPROVIDES_${PN} = "java2-runtime" -RPROVIDES_${PN}_class-native = "" +PROVIDES:class-native = "virtual/java-native" +RPROVIDES:${PN} = "java2-runtime" +RPROVIDES:${PN}:class-native = "" BBCLASSEXTEND = "native" -inherit java autotools update-alternatives pkgconfig relative_symlinks distro_features_check +inherit java autotools update-alternatives pkgconfig relative_symlinks features_check -REQUIRED_DISTRO_FEATURES_class-target = "x11" +REQUIRED_DISTRO_FEATURES:class-target = "x11" # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" -do_configure_append_class-native() { +do_configure:append:class-native() { sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \ -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \ ${WORKDIR}/java } -EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" +EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi --disable-int-inlining" # Needed for big compilation targets like OpenJDK -CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB" +CFLAGS:append:class-native = " -DDEFAULT_MAX_HEAP=1024*MB" EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/javac \ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ " # Enforce usage of ecj-initial. -EXTRA_OEMAKE_class-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ +EXTRA_OEMAKE:class-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ " -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/java ${D}${bindir}/java } PRIVATE_LIBS = "libjvm.so" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" -FILES_${PN} += "${libdir}/jamvm/lib*.so" +FILES:${PN} += "${libdir}/jamvm/lib*.so" -ALTERNATIVE_${PN} = "java" +ALTERNATIVE:${PN} = "java" ALTERNATIVE_TARGET = "${bindir}/jamvm" ALTERNATIVE_PRIORITY = "4" # shared state for jamvm-native does not work diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb index 57f7e64..34861ac 100644 --- a/recipes-core/jamvm/jamvm_git.bb +++ b/recipes-core/jamvm/jamvm_git.bb @@ -6,7 +6,7 @@ require jamvm.inc SRCREV = "6cef41d859fbc9ce7868a97cb2cb5dd2b10b9103" PV = "2.0.0-devel+git${SRCPV}" -SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \ +SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git;branch=master \ file://jamvm-jni_h-noinst.patch \ file://libffi.patch \ file://jamvm-minmax-heap.patch \ @@ -15,4 +15,4 @@ SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \ S = "${WORKDIR}/git" -COMPATIBLE_MACHINE_aarch64 = "-" +COMPATIBLE_MACHINE:aarch64 = "-" diff --git a/recipes-core/javasqlite/javasqlite_20150419.bb b/recipes-core/javasqlite/javasqlite_20150419.bb index 06fbac2..45262e2 100644 --- a/recipes-core/javasqlite/javasqlite_20150419.bb +++ b/recipes-core/javasqlite/javasqlite_20150419.bb @@ -5,7 +5,7 @@ This is a Java wrapper including a basic JDBC driver for the SQLite 2/3 \ database engine. It is designed using JNI to interface to the SQLite API. \ That API is wrapped by methods in the SQLite.Database class." -LICENSE = "BSD" +LICENSE = "MIT-Modern-Variant" SECTION = "application" PR = "r1" SRC_URI = " \ @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=3da0e50feac5f64f08184584a8cad58a" inherit autotools-brokensep DEPENDS += "sqlite3 sqlite3-native icedtea7-native" -RDEPENDS_${PN} += "sqlite3" -FILES_${PN} +="/usr/share" +RDEPENDS:${PN} += "sqlite3" +FILES:${PN} +="/usr/share" PARALLEL_MAKE = "-j 1" @@ -35,13 +35,9 @@ EXTRA_OECONF = " \ EXTRA_OEMAKE = "DESTDIR=${D}" # This dev package contains an '.so' file used for JNI development -INSANE_SKIP_${PN}-dev = "dev-elf" +INSANE_SKIP:${PN}-dev = "dev-elf" -do_configure_append (){ - cp ${S}/*-libtool ${S}/libtool -} - -do_compile_prepend (){ +do_compile:prepend (){ echo '#!/bin/sh' > ${STAGING_BINDIR_NATIVE}/cc echo '${BUILD_CC} $@' >> ${STAGING_BINDIR_NATIVE}/cc chmod a+x ${STAGING_BINDIR_NATIVE}/cc diff --git a/recipes-core/jcraft/jsch_0.1.40.bb b/recipes-core/jcraft/jsch_0.1.40.bb index 1d4b96b..aeb04b4 100644 --- a/recipes-core/jcraft/jsch_0.1.40.bb +++ b/recipes-core/jcraft/jsch_0.1.40.bb @@ -1,6 +1,6 @@ SUMMARY = "SSH implementation in Java" HOMEPAGE = "http://www.jcraft.com/jsch" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55e3b6a0987ccd0c34530f3df2d206ae" SRC_URI = "${SOURCEFORGE_MIRROR}/jsch/jsch-${PV}.zip" @@ -9,8 +9,8 @@ inherit java-library DEPENDS = "jzlib" -RDEPENDS_${PN} = "libjzlib-java" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "libjzlib-java" +RDEPENDS:${PN}:class-native = "" do_compile() { mkdir -p build @@ -25,5 +25,7 @@ do_compile() { SRC_URI[md5sum] = "b59cec19a487e95aed68378976b4b566" SRC_URI[sha256sum] = "ca9d2ae08fd7a8983fb00d04f0f0c216a985218a5eb364ff9bee73870f28e097" +CVE_STATUS[CVE-2016-5725] = "not-applicable-platform: Issue only applies on Windows" + BBCLASSEXTEND = "native" diff --git a/recipes-core/jcraft/jzlib_1.0.7.bb b/recipes-core/jcraft/jzlib_1.0.7.bb index 70b5212..1e34d2c 100644 --- a/recipes-core/jcraft/jzlib_1.0.7.bb +++ b/recipes-core/jcraft/jzlib_1.0.7.bb @@ -1,5 +1,5 @@ SUMMARY = "zlib implementation in Java" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a2b2e5b95bf768dd5c4ca097c9cde9e9" HOMEPAGE = "http://www.jcraft.com/jzlib" diff --git a/recipes-core/jdepend/jdepend_2.9.1.bb b/recipes-core/jdepend/jdepend_2.9.1.bb index 7c6cc8c..1fa156c 100644 --- a/recipes-core/jdepend/jdepend_2.9.1.bb +++ b/recipes-core/jdepend/jdepend_2.9.1.bb @@ -1,12 +1,12 @@ SUMMARY = "Design quality metrics generator for each Java" # see https://github.com/clarkware/jdepend/blob/master/LICENSE -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f5777d32a7709d558c2877d4a6616230" HOMEPAGE = "https://github.com/clarkware/jdepend" -SRC_URI = "git://github.com/clarkware/jdepend" +SRC_URI = "git://github.com/clarkware/jdepend;protocol=https;branch=master" SRCREV = "57980590313a5dbde236a3eb2c8958e9e53e6a10" S = "${WORKDIR}/git" diff --git a/recipes-core/jikes/jikes_1.22.bb b/recipes-core/jikes/jikes_1.22.bb index 233005a..3e83ff8 100644 --- a/recipes-core/jikes/jikes_1.22.bb +++ b/recipes-core/jikes/jikes_1.22.bb @@ -13,14 +13,14 @@ inherit autotools update-alternatives relative_symlinks BBCLASSEXTEND = "native" -RDEPENDS_${PN} = "classpath" -PROVIDES_class-native = "" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "classpath" +PROVIDES:class-native = "" +RDEPENDS:${PN}:class-native = "" EXTRA_OECONF = "--disable-fp-emulation --enable-source15" # configure script incorrectly defines these when cross compiling for ARM -CXXFLAGS_append_arm += "-UHAVE_64BIT_TYPES -DWORDS_BIGENDIAN=1" +CXXFLAGS:append:arm = " -UHAVE_64BIT_TYPES -DWORDS_BIGENDIAN=1" do_install() { oe_runmake 'DESTDIR=${D}' install @@ -28,7 +28,7 @@ do_install() { } PROVIDES = "virtual/javac" -ALTERNATIVE_${PN} = "javac" +ALTERNATIVE:${PN} = "javac" ALTERNATIVE_LINK = "/usr/bin/javac" ALTERNATIVE_TARGET = "${bindir}/javac.jikes" diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb index b8f9ffb..48ec357 100644 --- a/recipes-core/jlex/jlex_1.2.6.bb +++ b/recipes-core/jlex/jlex_1.2.6.bb @@ -1,16 +1,18 @@ SUMMARY = "Lexical analyzer generator for Java" AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian" + +JLEX_MAIN_FILENAME = "jlex-${PV}-Main.java" LICENSE = "JLEX" -LIC_FILES_CHKSUM = "file://Main.java;beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a" +LIC_FILES_CHKSUM = "file://${JLEX_MAIN_FILENAME};beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a" PACKAGE_ARCH = "${TUNE_PKGARCH}" -RDEPENDS_${PN} = "java2-runtime" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "java2-runtime" +RDEPENDS:${PN}:class-native = "" inherit java-library -SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/${PV}/Main.java \ +SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/${PV}/Main.java;downloadfilename=${JLEX_MAIN_FILENAME} \ file://jlex \ " @@ -26,20 +28,21 @@ do_configure() { do_compile() { mkdir -p build + cp ${JLEX_MAIN_FILENAME} Main.java javac -d build Main.java fastjar cf ${BP}.jar -C build . } -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 0755 jlex ${D}${bindir}/ } PACKAGES = "${PN}" -FILES_${PN} += "${datadir_java}" +FILES:${PN} += "${datadir_java}" SRC_URI[md5sum] = "fe0cff5db3e2f0f5d67a153cf6c783af" SRC_URI[sha256sum] = "aeebaece3b3a53972bb0ba0f810540386c267070ee9dca6ffa43c6ff74a54bd7" diff --git a/recipes-core/junit/junit_3.8.2.bb b/recipes-core/junit/junit_3.8.2.bb index b366910..a1fd265 100644 --- a/recipes-core/junit/junit_3.8.2.bb +++ b/recipes-core/junit/junit_3.8.2.bb @@ -5,7 +5,7 @@ LICENSE = "CPL-1.0" LIC_FILES_CHKSUM = "file://cpl-v10.html;md5=67a4b75d42edcbd82d2878eba913691b" PR = "r1" -SRC_URI = "http://downloads.sourceforge.net/junit/junit${PV}.zip" +SRC_URI = "https://downloads.sourceforge.net/junit/junit${PV}.zip" S = "${WORKDIR}/junit${PV}" @@ -16,14 +16,14 @@ inherit java-library do_unpackpost[dirs] = "${B}" do_unpackpost() { mkdir -p src - # Prevent deletion by do_removebinaries. + # Prevent deletion by do_deletebinaries. if [ -e src.jar ]; then mv src.jar src.zip fi unzip -o src.zip -d src } -addtask unpackpost before do_removebinaries after do_unpack +addtask unpackpost before do_deletebinaries after do_unpack do_compile() { mkdir -p build diff --git a/recipes-core/libmatthew/libmatthew.inc b/recipes-core/libmatthew/libmatthew.inc index 2119c0b..4157d51 100644 --- a/recipes-core/libmatthew/libmatthew.inc +++ b/recipes-core/libmatthew/libmatthew.inc @@ -5,11 +5,14 @@ SECTION = "libs" LICENSE = "MIT" DEPENDS = "virtual/java-native classpath-native classpath" + S = "${WORKDIR}/libmatthew-java-${PV}" PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit java-library +include recipes-core/classpath/classpath-features-check.inc + # Some internal version numbers which change from time to time. # Allowing to override them makes this include file more # versatile. @@ -47,7 +50,7 @@ do_install() { oe_libinstall -so libunix-java ${D}${libdir_jni} } -do_install_append() { +do_install:append() { rm ${D}${datadir_java}/${PN}.jar } PACKAGES = "\ @@ -56,17 +59,17 @@ PACKAGES = "\ ${PN}-io-java ${PN}-debug-java \ " -FILES_libcgi-java = "${datadir_java}/cgi*.jar" -FILES_libcgi-jni = "${libdir_jni}/libcgi-java.so" -FILES_libcgi-jni-dbg = "${libdir_jni}/.debug/libcgi-java.so" -RDEPENDS_libcgi-java = "libcgi-jni" +FILES:libcgi-java = "${datadir_java}/cgi*.jar" +FILES:libcgi-jni = "${libdir_jni}/libcgi-java.so" +FILES:libcgi-jni-dbg = "${libdir_jni}/.debug/libcgi-java.so" +RDEPENDS:libcgi-java = "libcgi-jni" -FILES_libunixsocket-java = "${datadir_java}/unix*.jar" -FILES_libunixsocket-jni = "${libdir_jni}/libunix-java.so" -FILES_libunixsocket-jni-dbg = "${libdir_jni}/.debug/libunix-java.so" -RDEPENDS_libunixsocket-java = "libunixsocket-jni" +FILES:libunixsocket-java = "${datadir_java}/unix*.jar" +FILES:libunixsocket-jni = "${libdir_jni}/libunix-java.so" +FILES:libunixsocket-jni-dbg = "${libdir_jni}/.debug/libunix-java.so" +RDEPENDS:libunixsocket-java = "libunixsocket-jni" -FILES_${PN}-io-java = "${datadir_java}/io*.jar" +FILES:${PN}-io-java = "${datadir_java}/io*.jar" -FILES_${PN}-debug-java = "${datadir_java}/debug-*.jar ${datadir_java}/hexdump*.jar" +FILES:${PN}-debug-java = "${datadir_java}/debug-*.jar ${datadir_java}/hexdump*.jar" diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 9d2dd8f..cba1ea6 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc @@ -4,17 +4,17 @@ LICENSE = "GPL-2.0-with-classpath-exception" PRIORITY = "optional" SECTION = "libs" -ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1].split("-")[1] or '1.0'}" +ICEDTEA_VERSION = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1].split("-")[1] or '1.0'}" S = "${WORKDIR}/${ICEDTEA}" -DEPENDS_append_libc-uclibc = " virtual/libiconv " +DEPENDS:append_libc-uclibc = " virtual/libiconv " # The OpenJDK build with interpreter optimizations for ARM depends on a binary # that generates constants for an assembler source file. There is no other # way than to generate this on a pseudo machine. Cross-compiling would not help # because structure sizes and/or alignment may differ. -DEPENDS_append = " qemu-native " +DEPENDS:append = " qemu-native " B = "${S}/build" @@ -93,7 +93,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" export CACAO_CONFIGURE_ARGS = " \ - ${@['','--enable-softfloat'][d.getVar('TARGET_FPU', True) == 'soft']}" + ${@['','--enable-softfloat'][d.getVar('TARGET_FPU') == 'soft']}" JAVA_HOME[unexport] = "1" @@ -138,14 +138,14 @@ EXTRA_OECONF += " \ --disable-system-sctp \ " -do_configure_prepend() { +do_configure:prepend() { # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with # ".patch" into the patches directory. find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; } -do_configure_append() { +do_configure:append() { oe_runmake patch } @@ -168,7 +168,7 @@ EXTRA_OEMAKE += ' \ OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,${libdir}/llvm${WANT_LLVM_RELEASE}" -OE_LAUNCHER_LDFLAGS_arm = "" +OE_LAUNCHER_LDFLAGS:arm = "" EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' @@ -229,7 +229,7 @@ PACKAGES = " \ ${JDKPN}-common \ " -FILES_${JDKPN}-dbg = "\ +FILES:${JDKPN}-dbg = "\ ${JDK_HOME}/bin/.debug \ ${JDK_HOME}/lib/.debug \ ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ @@ -244,9 +244,9 @@ FILES_${JDKPN}-dbg = "\ ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ " -FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" -RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre" -FILES_${JDKPN}-demo-dbg = "\ +FILES:${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" +RDEPENDS:${JDKPN}-demo = "${JDKPN}-jre" +FILES:${JDKPN}-demo-dbg = "\ ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ @@ -258,13 +258,13 @@ FILES_${JDKPN}-demo-dbg = "\ ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ " -FILES_${JDKPN}-source = "${JDK_HOME}/src.zip" +FILES:${JDKPN}-source = "${JDK_HOME}/src.zip" -FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java" +FILES:${JDKPN}-java = "${JDK_HOME}/jre/bin/java" -FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" +FILES:${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" -FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ +FILES:${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ ${JDK_HOME}/jre/THIRD_PARTY_README \ ${JDK_HOME}/jre/LICENSE \ ${JDK_HOME}/ASSEMBLY_EXCEPTION \ @@ -274,7 +274,7 @@ FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ ${JDK_HOME}/jre/lib \ " -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${JDK_HOME}/jre/bin/keytool \ ${JDK_HOME}/jre/bin/orbd \ ${JDK_HOME}/jre/bin/pack200 \ @@ -287,9 +287,9 @@ FILES_${PN}_append = " \ ${JDK_HOME}/jre/bin/javaws \ " -RDEPENDS_${JDKPN}-common = "librhino-java" +RDEPENDS:${JDKPN}-common = "librhino-java" -RPROVIDES_${JDKPN}-vm-zero = "java2-vm" +RPROVIDES:${JDKPN}-vm-zero = "java2-vm" # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark @@ -298,39 +298,39 @@ RPROVIDES_${JDKPN}-vm-zero = "java2-vm" # * print_dependents_warning: Package openjdk-7-vm-shark is depended upon by packages: # * print_dependents_warning: openjdk-7-java # * print_dependents_warning: These might cease to work if package openjdk-7-vm-shark is removed. -RRECOMMENDS_${JDKPN}-java = "java2-vm" +RRECOMMENDS:${JDKPN}-java = "java2-vm" # For some reason shark and cacao do not automatically depends on -common. # So we add that manually. # There is a symlink to a .so but this one is valid. -INSANE_SKIP_${JDKPN}-vm-zero = "dev-so" -INSANE_SKIP_${JDKPN}-common = "dev-so" +INSANE_SKIP:${JDKPN}-vm-zero = "dev-so" +INSANE_SKIP:${JDKPN}-common = "dev-so" # libfreetype.so.6 is copied from STAGING_LIBDIR # which is already stripped. -INSANE_SKIP_${JDKPN}-jre = "already-stripped" +INSANE_SKIP:${JDKPN}-jre = "already-stripped" -FILES_${JDKPN}-jdk = " \ +FILES:${JDKPN}-jdk = " \ ${JDK_HOME}/bin \ ${JDK_HOME}/lib \ ${JDK_HOME}/include \ ${JDK_HOME}${libdir}/jvm \ " -RDEPENDS_${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common" -RDEPENDS_${JDKPN}-java = "${JDKPN}-common" -RPROVIDES_${JDKPN}-jre = "java2-runtime" +RDEPENDS:${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common" +RDEPENDS:${JDKPN}-java = "${JDKPN}-common" +RPROVIDES:${JDKPN}-jre = "java2-runtime" -RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre" +RDEPENDS:${JDKPN}-jdk = "${JDKPN}-jre" -FILES_${JDKPN}-doc = "${JDK_HOME}/man" +FILES:${JDKPN}-doc = "${JDK_HOME}/man" # Name of the directory containing the compiled output BUILD_DIR = "openjdk.build" BUILD_DIR_ECJ = "openjdk.build-ecj" # Force arm mode for now -ARM_INSTRUCTION_SET_armv4t = "ARM" +ARM_INSTRUCTION_SET:armv4t = "ARM" ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" @@ -361,7 +361,7 @@ LANGTOOLS_URI = "${ICEDTEA_DROP_URL}/${LANGTOOLS_FILE};name=langtools;unpack=fal # handles all postinst action for openjdk # some of the former results in a build error because "ERR" is in the first line. -pkg_postinst_ontarget_${JDKPN}-vm-shark () { +pkg_postinst_ontarget:${JDKPN}-vm-shark () { true if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg @@ -370,7 +370,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-shark () { fi } -pkg_prerm_${JDKPN}-vm-shark () { +pkg_prerm:${JDKPN}-vm-shark () { true sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then @@ -381,7 +381,7 @@ pkg_prerm_${JDKPN}-vm-shark () { echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg } -pkg_postinst_ontarget_${JDKPN}-vm-cacao () { +pkg_postinst_ontarget:${JDKPN}-vm-cacao () { true if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg @@ -390,7 +390,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-cacao () { fi } -pkg_prerm_${JDKPN}-vm-cacao () { +pkg_prerm:${JDKPN}-vm-cacao () { true sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then @@ -401,7 +401,7 @@ pkg_prerm_${JDKPN}-vm-cacao () { echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg } -pkg_postinst_ontarget_${JDKPN}-vm-jamvm () { +pkg_postinst_ontarget:${JDKPN}-vm-jamvm () { true if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg @@ -410,7 +410,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-jamvm () { fi } -pkg_prerm_${JDKPN}-vm-jamvm () { +pkg_prerm:${JDKPN}-vm-jamvm () { true sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then @@ -421,7 +421,7 @@ pkg_prerm_${JDKPN}-vm-jamvm () { echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg } -pkg_postinst_ontarget_${JDKPN}-vm-zero () { +pkg_postinst_ontarget:${JDKPN}-vm-zero () { true if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` @@ -432,7 +432,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-zero () { sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg } -pkg_prerm_${JDKPN}-vm-zero () { +pkg_prerm:${JDKPN}-vm-zero () { true sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then @@ -441,14 +441,14 @@ pkg_prerm_${JDKPN}-vm-zero () { fi } -pkg_postinst_${JDKPN}-jre () { +pkg_postinst:${JDKPN}-jre () { ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre } inherit update-alternatives -ALTERNATIVE_${JDKPN}-jre = "java keytool" -ALTERNATIVE_${JDKPN}-jdk = "javac" +ALTERNATIVE:${JDKPN}-jre = "java keytool" +ALTERNATIVE:${JDKPN}-jdk = "javac" ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java" ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" @@ -459,3 +459,6 @@ ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool" ALTERNATIVE_PRIORITY = "50" + +# canon-prefix-map doesn't exist in gcc 12.x +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" diff --git a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb index aa165f5..57827d9 100644 --- a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb +++ b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-7:" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11" @@ -41,6 +41,7 @@ OEPATCHES = "\ file://build-hacks.patch \ file://fix_hotspot_crosscompile.patch \ file://icedtea-makefile-unzip.patch \ + file://icedtea-m4-fix-xattr-include-path.patch \ " ICEDTEAPATCHES = "\ @@ -50,6 +51,7 @@ ICEDTEAPATCHES = "\ file://icedtea-crosscompile-fix.patch;apply=no \ file://icedtea-xawt-crosscompile-fix.patch;apply=no \ file://icedtea-jdk-unzip.patch;apply=no \ + file://icedtea-jdk-fix-xattr-include.patch;apply=no \ file://icedtea-dtrace-std_h.patch;apply=no \ file://icedtea-hotspot-fix-string-literal-marcos.patch;apply=no \ file://icedtea-flags-to-compile-with-GCC-6.patch;apply=no \ @@ -63,6 +65,7 @@ DISTRIBUTION_PATCHES = "\ patches/icedtea-crosscompile-fix.patch \ patches/icedtea-xawt-crosscompile-fix.patch \ patches/icedtea-jdk-unzip.patch \ + patches/icedtea-jdk-fix-xattr-include.patch \ patches/icedtea-dtrace-std_h.patch \ patches/icedtea-hotspot-fix-string-literal-marcos.patch \ patches/icedtea-flags-to-compile-with-GCC-6.patch \ @@ -77,4 +80,4 @@ export DISTRIBUTION_PATCHES # to avoid this error add -fpermissive # # NOTE: When updating the recipe, please check if this is still needed -CFLAGS_append = " -Wno-error=deprecated-declarations -Wno-error=narrowing -fpermissive" +CFLAGS:append = " -Wno-error=deprecated-declarations -Wno-error=narrowing -fpermissive" diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 4d8f935..82bf31e 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc @@ -8,13 +8,12 @@ require openjdk-common.inc AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" - FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:" # for weird openjdk-common.inc S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}" -SRC_URI = " \ +SRC_URI = "\ ${OPENJDK_URI} \ ${HOTSPOT_URI} \ ${CORBA_URI} \ @@ -27,6 +26,11 @@ SRC_URI = " \ ${PATCHES_URI} \ " +do_configure:prepend () { + export TOPDIR=${S} + sed -i 's#\$TOPDIR#${S}#g' ${S}/common/autoconf/configure.ac +} + do_unpack_extract_submodules () { cd "${S}" # tar --transform @@ -39,6 +43,21 @@ do_unpack_extract_submodules () { tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" } +do_patch:prepend() { + # use do_patch:prepend syntax and not pre/postfuncs to + # call do_unpack_extract_submodules + # *) the archiver.bbclass modifies WORKDIR, S, B,... + # and those modifications are lost otherwise, + # which leads to build failures in do_unpack_and_patch -> do_patch + func = 'do_unpack_extract_submodules' + bb.build.exec_func(func, d) + + # delete X11 wrappers if x11 is not part of PACKAGECONFIG + if bb.utils.contains('PACKAGECONFIG', 'x11', False, True, d): + func_delete = 'do_unpack_delete_X11_wrappers' + bb.build.exec_func(func_delete, d) +} + do_unpack_delete_X11_wrappers() { find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java' -delete } @@ -93,10 +112,7 @@ def package_config_option_cleanup(d): if not option_headless and not with_cups: option_headless = True - if not option_soundless and not with_alsa: - option_soundless = True - - if not option_soundless and not with_pulseaudio: + if not option_soundless and not with_pulseaudio and not with_alsa: option_soundless = True options = {'make': [], 'cpp': [], 'env': [], 'configure': ["--disable-ccache"] } @@ -152,34 +168,32 @@ def jdk_configure_options(d): options = package_config_option_cleanup(d) return options[3] -do_unpack[postfuncs] += "do_unpack_extract_submodules" -do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" - -do_configure_prepend() { - export ${@jdk_environment_options(d)} -} +#do_unpack[postfuncs] += "do_unpack_extract_submodules" +#do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" export DEBUG_BINARIES = "true" ALTERNATIVE_PRIORITY = "50" -OPENJDK_UPDATE_VERSION = "${@d.getVar('PV', True).split('b')[0]}" -OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV', True).split('b')[1]}" -EXTRA_OECONF_append = "\ +OPENJDK_UPDATE_VERSION = "${PV}" +OPENJDK_BUILD_NUMBER = "ga" +EXTRA_OECONF:append = "\ --with-build-number=${OPENJDK_BUILD_NUMBER} \ --with-update-version=${OPENJDK_UPDATE_VERSION} \ " # Since v6, GCC sets the default C++ standard to C++14 and introduces -# dead store elimination by default. OpenJDK 8 is not ready for either -# of these changes. -FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" -FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" -FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" +# dead store elimination by default. +# Since v10, GCC defaults to -fno-common. +# OpenJDK 8 is not ready for either of these changes. +GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon" # flags for -native, and for bits that need a host-tool during -cross -BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}" -BUILD_CXXFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}" +BUILD_CFLAGS:append = " ${GLOBAL_FLAGS}" +BUILD_CXXFLAGS:append = " ${GLOBAL_FLAGS}" # flags for -cross -TARGET_CFLAGS_append = " ${@openjdk_build_helper_get_target_cflags(d)}" -TARGET_CXXFLAGS_append = " ${@openjdk_build_helper_get_target_cflags(d)}" +TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}" +TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}" + +# canon-prefix-map doesn't exist in gcc 12.x +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 7552930..ff682f1 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc @@ -13,6 +13,7 @@ PRIVATE_LIBS = "\ libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \ libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \ libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \ + libfreetype.so.6 \ " PACKAGECONFIG ??= " \ @@ -42,23 +43,19 @@ PACKAGECONFIG[repack] = ",,," PACKAGECONFIG[kerberos] = ",,krb5" -CACHED_CONFIGUREVARS = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_includes=${STAGING_INCDIR}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_libraries=${STAGING_LIBDIR}', '', d)} \ -" - require openjdk-8-common.inc JAVA_HOME[unexport] = "1" -SRC_URI_append = "\ +SRC_URI:append = "\ file://jvm.cfg \ + file://0011-autoconf-fix-CC-with-arguments-detection.patch \ + file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ " -EXTRA_OECONF_append = "\ +EXTRA_OECONF:append = "\ --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ \ - --with-sys-root=${STAGING_DIR_HOST} \ --with-tools-dir=${STAGING_DIR_NATIVE} \ --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \ @@ -66,18 +63,26 @@ EXTRA_OECONF_append = "\ --disable-precompiled-headers \ --disable-zip-debug-info \ \ + --with-sys-root=${STAGING_DIR_HOST} \ --with-extra-cflags='${CFLAGS}' \ --with-extra-cxxflags='${CXXFLAGS}' \ --with-extra-ldflags='${LDFLAGS}' \ + --with-freetype-include=${STAGING_INCDIR}/freetype2 \ + --with-freetype-lib=${STAGING_LIBDIR} \ \ ${@jdk_configure_options(d)} \ " -do_configure_append() { +do_configure:prepend() { + export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" + export ${@jdk_environment_options(d)} +} + +do_configure:append() { sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then if [ -d ${D}${JDK_HOME} ] ; then find ${D}${JDK_HOME} -name "*.jar" -print0 | \ @@ -94,12 +99,12 @@ do_install_append() { fi } +do_install[vardepsexclude] += "BB_NUMBER_THREADS" + export MAKE_VERBOSE = "y" export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" -BUILD_LD="${BUILD_CCLD}" - -EXTRA_OEMAKE_append = '\ +EXTRA_OEMAKE:append = '\ ${@jdk_make_options(d)} \ ALT_SDT_H="${STAGING_INCDIR}" \ ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ @@ -110,14 +115,14 @@ EXTRA_OEMAKE_append = '\ ' python remove_debuglink() { - dvar = d.getVar('PKGD', True) - objcopy = d.getVar("OBJCOPY", True) + dvar = d.getVar('PKGD') + objcopy = d.getVar("OBJCOPY") # Remove the previous debuglink if it has existed, because it has a different file name with that we will add. - if d.getVar('PN', True).find("jre") != -1: - file = dvar + d.getVar("JRE_HOME", True) + "/lib/" + d.getVar("JDK_ARCH", True) + "/server/libjvm.so" + if d.getVar('PN').find("jre") != -1: + file = dvar + d.getVar("JRE_HOME") + "/lib/" + d.getVar("JDK_ARCH") + "/server/libjvm.so" else: - file = dvar + d.getVar("JDK_HOME", True) + "/jre/lib/" + d.getVar("JDK_ARCH", True) + "/server/libjvm.so" + file = dvar + d.getVar("JDK_HOME") + "/jre/lib/" + d.getVar("JDK_ARCH") + "/server/libjvm.so" cmd = "'%s' --remove-section .gnu_debuglink '%s'" % (objcopy, file) oe.utils.getstatusoutput(cmd) @@ -125,5 +130,6 @@ python remove_debuglink() { PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" -# There is a symlink to a .so but this one is valid. -INSANE_SKIP_${PN} = "dev-so" +# FIXME libjsig.so is a symlink to a .so but this one is valid +# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped +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..c02e183 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc @@ -8,8 +8,8 @@ DEPENDS = "\ " PACKAGECONFIG ??= "gif jpeg png zlib" -PACKAGECONFIG[x11] = "--with-x,,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" -PACKAGECONFIG[cups] = "--with-cups,,cups" +PACKAGECONFIG[x11] = "--with-x,,libx11-native xorgproto-native libxt-native libxext-native libxrender-native libxtst-native" +PACKAGECONFIG[cups] = "--with-cups,,cups-native" PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native" PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib-native" PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," @@ -17,48 +17,51 @@ PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native" PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" -EXTRA_OECONF_append = "\ +EXTRA_OECONF:append = "\ --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ \ - --with-sys-root=${STAGING_DIR_NATIVE} \ --with-tools-dir=${STAGING_DIR_NATIVE} \ --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native \ --with-extra-cflags='${CFLAGS}' \ --with-extra-cxxflags='${CXXFLAGS}' \ --with-extra-ldflags='${LDFLAGS}' \ + --with-freetype-include=${STAGING_INCDIR_NATIVE}/freetype2 \ + --with-freetype-lib=${STAGING_LIBDIR_NATIVE} \ --with-stdc++lib=dynamic \ ${@jdk_configure_options(d)} \ " # --with-boot-jdk=${WORKDIR}/fake-jdk -inherit native - require openjdk-8-common.inc -CFLAGS_append = " ${@jdk_cpp_options(d)}" -CPPFLAGS_append = "${@jdk_cpp_options(d)}" -CXXFLAGS_append = " ${@jdk_cpp_options(d)}" +inherit native + +CFLAGS:append = " ${@jdk_cpp_options(d)}" +CPPFLAGS:append = "${@jdk_cpp_options(d)}" +CXXFLAGS:append = " ${@jdk_cpp_options(d)}" export MAKE_VERBOSE = "y" export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace" -EXTRA_OEMAKE_append = ' \ +EXTRA_OEMAKE:append = ' \ ${@jdk_make_options(d)} \ MAKE_VERBOSE=y VERBOSE=-s LOG_LEVEL=trace \ QUIETLY= \ images \ ' -do_configure_prepend() { +do_configure:prepend() { export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" + export ${@jdk_environment_options(d)} + unset CC CXX } -do_compile_prepend() { +do_compile:prepend() { export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts" } -do_compile_append() { +do_compile:append() { set -x mkdir -p ${B}/certs for pem in $(find ${STAGING_DATADIR}/ca-certificates -name "*.crt") @@ -85,3 +88,6 @@ do_install() { ln -sf "../lib/jvm/${JDK_DIR}/bin/$tool" ${D}${bindir}/$tool done } + +# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped +INSANE_SKIP:${PN} = "already-stripped" 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 @@ -require openjdk-8-release-${PV}.inc -require openjdk-8-native.inc diff --git a/recipes-core/openjdk/openjdk-8-native_272.bb b/recipes-core/openjdk/openjdk-8-native_272.bb new file mode 100644 index 0000000..39321f2 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-native_272.bb @@ -0,0 +1,2 @@ +require openjdk-8-release.inc +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 @@ -require openjdk-8-release-172b11-common.inc - -COMPATIBLE_HOST = "^$" -COMPATIBLE_HOST_armv7a = "arm" -COMPATIBLE_HOST_armv7ve = "arm" - -CORBA_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" -SRC_URI[corba.md5sum] = "557b94847d8fade14c048cb0a96ed035" -SRC_URI[corba.sha256sum] = "366fa9aaf11d75f74e8c6bdf9cab9214cf66b0eac1ca40f2789b3ba442929708" - -HOTSPOT_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" -SRC_URI[hotspot.md5sum] = "37d796794234f38fa71339ba78368b80" -SRC_URI[hotspot.sha256sum] = "5f89f8ba9a099a2d84b4ca6bd49553ce4efe1b29d55de9134809b7b59b6c9ce3" - -JAXP_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" -SRC_URI[jaxp.md5sum] = "2dc311a7c0d6483226cdc5e501b1f8d0" -SRC_URI[jaxp.sha256sum] = "f62db09a41213b5b5d1886c1aeabe43def09235de1d60af518213b9acea4fdca" - -JAXWS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" -SRC_URI[jaxws.md5sum] = "fbd81e288d1ee5df631f213c130f21bb" -SRC_URI[jaxws.sha256sum] = "bac66e848ee48c6fef6130db4bb6879dbd64c550c1f42e4676ab6a2c3ee4fab8" - -JDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" -SRC_URI[jdk.md5sum] = "b8003e6f1714617461f3eb7ee8b1efee" -SRC_URI[jdk.sha256sum] = "0a7eef6fef2b457bef3bd1d24031234bbb9d74a5fca2f65e1603278cd9d393a0" - -LANGTOOLS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" -SRC_URI[langtools.md5sum] = "e38f50b0113b3a956ac4917720655e93" -SRC_URI[langtools.sha256sum] = "9ca88fcfe5a07861de693ff3b38d03f063a7937576cd93116ea6b4a4bd7894d5" - -NASHORN_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" -SRC_URI[nashorn.md5sum] = "c191cc92996fcb271254fc0a4f3eb7c9" -SRC_URI[nashorn.sha256sum] = "853bb3162fefa989fa0c31848cb990d8e5698ccd8a2a336dbf98bde35eb5241d" - -OPENJDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" -SRC_URI[openjdk.md5sum] = "25398ccf25633a878dca54a8d606e48e" -SRC_URI[openjdk.sha256sum] = "8c8e515ebcceded4b90187b4bdaf129b63ae6e64ddfe4f05a60df0694235b9e7" - -PACKAGECONFIG_append_armv7a = " client" -PACKAGECONFIG_append_armv7ve = " client" - -do_install_append() { - if [ -d ${D}${JDK_HOME} ] ; then - sed -e 's,^\(-server ERROR$\),# \1,' \ - -e 's,^-client IGNORE,-client ERROR,' \ - -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ - -i ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg - fi - if [ -d ${D}${JRE_HOME} ] ; then - sed -e 's,^\(-server ERROR$\),# \1,' \ - -e 's,^-client IGNORE,-client ERROR,' \ - -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ - -i ${D}${JRE_HOME}/lib/${JDK_ARCH}/jvm.cfg - fi -} - -JDK_ARCH_armv7a = "aarch32" -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 @@ -require openjdk-8-release-172b11-common.inc - -COMPATIBLE_HOST = "aarch64" - -CORBA_CHANGESET_aarch64 = "3a04a7c080af" -SRC_URI[corba.md5sum] = "758b29d6cf714fd894df8674afd78e17" -SRC_URI[corba.sha256sum] = "564113dbeadc57ac5831ccc056e0b920adbd3b74558cf750aa899f5de25ceb5e" - -HOTSPOT_CHANGESET_aarch64 = "1ced2ae00e35" -SRC_URI[hotspot.md5sum] = "1db8a0e5e63352f1743e9d41ab6ed5cf" -SRC_URI[hotspot.sha256sum] = "6993c3138035a7c0d2782b1ca7aabdb43452b1abbcc60448042f5c9207b03ab5" - -JAXP_CHANGESET_aarch64 = "ab8087f496fe" -SRC_URI[jaxp.md5sum] = "0e7d8755af72aaf9ec7521514d8bb541" -SRC_URI[jaxp.sha256sum] = "6e70c1535d738dc2c4e3a2fb9e6e11c660172b6d2ce905ec33e8924f8c208978" - -JAXWS_CHANGESET_aarch64 = "1e71aeefeecf" -SRC_URI[jaxws.md5sum] = "16ff9ba1007aee21ad3df472b1f5c55e" -SRC_URI[jaxws.sha256sum] = "b6ccb2855c2e9cd5778b193b5ad47f2e13496cbbbad74497c70216cd04b4c7dc" - -JDK_CHANGESET_aarch64 = "e8e6553e7ca9" -SRC_URI[jdk.md5sum] = "52b35732c17e9048e506b7b46c1282f8" -SRC_URI[jdk.sha256sum] = "ffaa79dad3b126af77ac9c230c54805b224c5d6517830a37c7272678407c99da" - -LANGTOOLS_CHANGESET_aarch64 = "14d381cbe563" -SRC_URI[langtools.md5sum] = "d14425cc0334ed46ce695c9930bff6d5" -SRC_URI[langtools.sha256sum] = "a4334c8859fe48bf2eae3b076785ff2e36a5ae80cf5840aef32731c3099a2274" - -NASHORN_CHANGESET_aarch64 = "c667b467b394" -SRC_URI[nashorn.md5sum] = "0389c953bdd14c804d873d95ff4b3033" -SRC_URI[nashorn.sha256sum] = "7cd87e641f0781481635593c144c8030f20d97cfc048ca57bd56381bab8e7d92" - -OPENJDK_CHANGESET_aarch64 = "74564d40b0d6" -SRC_URI[openjdk.md5sum] = "13f7f15386f7aa0cc3383e9d1e98d2f1" -SRC_URI[openjdk.sha256sum] = "a6425e11700edcdc0761df9da75b28b48adc664f3d8259c49ced1c85af3dc502" diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc deleted file mode 100644 index d4e80f6..0000000 --- a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc +++ /dev/null @@ -1,145 +0,0 @@ -PATCHES_URI = "\ - file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ - file://filter-aclocal-copy-too.patch;striplevel=0 \ - file://dont-expect-fqpn-for-make.patch;striplevel=0 \ - file://openjdk8-no-genx11-in-headless.patch;striplevel=0 \ - file://openjdk8-no-unused-deps.patch;striplevel=0 \ - file://openjdk8-find-compiler-fix-env-respect.patch;striplevel=0 \ - file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;striplevel=0 \ - file://0001-jdk-comparison-between-pointer-and-integer.patch \ - file://0002-hotspot-fix-compilation-with-security-flags-enabled.patch \ - file://0003-jdk-Allow-using-a-system-installed-libjpeg.patch \ - file://0004-jdk-Allow-using-a-system-installed-libpng.patch \ - file://0005-hotspot-use-correct-include-for-poll.patch \ - file://0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ - file://0007-jdk-use-correct-include-for-poll.patch \ - file://0008-jdk-use-correct-include-for-signal.patch \ - file://0009-jdk-disable-backtrace-musl-build-fix.patch \ - file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \ - file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ - ${HOTSPOT_UB_PATCH} \ - ${LIBPNG_NEON_PATCH} \ - file://handle_extra_output.patch \ - file://hotspot-handle-gcc7-format-overflow.patch \ -" -HOTSPOT_UB_PATCH = "\ - file://0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch \ - file://0015-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ - file://0016-hotspot-Zero-build-requires-disabled-warnings.patch \ - file://0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ - file://0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch \ - file://0019-hotspot-Turn-on-the-Wreturn-type-warning.patch \ - file://0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch \ -" -HOTSPOT_UB_PATCH_prepend_aarch64 = "\ - file://0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch \ - file://0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch \ -" -HOTSPOT_UB_PATCH_append_armv7a = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" -HOTSPOT_UB_PATCH_append_armv7ve = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" -# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch -# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html -# by Roman Kennke (rkennke at redhat.com) -LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" -LIBPNG_NEON_PATCH_aarch64 = "" - -PATCHES_URI_append_class-target = "\ - file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ - file://openjdk8-fix-shark-build-common.patch;striplevel=0 \ - ${FIX_SHARK_BUILD_PT2_PATCH} \ - file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ - file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ - file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ - file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ -" -FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" -FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" -FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" - -PATCHES_URI_append_libc-musl = "\ - ${OBSOLETE_ISNANF_PATCH} \ - file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ - file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ - file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ - file://musl-0005-hotspot-disable-agent-build-common.patch \ - ${DISABLE_AGENT_BUILD_PT2} \ - file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \ - ${REMOVE_GLIBC_DEPENDENCIES_PT2} \ - file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ - file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ - file://musl-0009-jdk-musl-has-gethostby_r.patch \ -" -OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch" -OBSOLETE_ISNANF_PATCH_armv7a = "" -OBSOLETE_ISNANF_PATCH_armv7ve = "" -DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch" -DISABLE_AGENT_BUILD_PT2_armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" -DISABLE_AGENT_BUILD_PT2_armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" -REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch" -REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" -REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" - -PATCHES_URI_append_libc-musl_armv7a = " file://hotspot-remaining-musl-fixes-aarch32.patch" -PATCHES_URI_append_libc-musl_armv7ve = " file://hotspot-remaining-musl-fixes-aarch32.patch" -PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" - -# Name of the directory containing the compiled output -BUILD_DIR = "openjdk.build" -BUILD_DIR_ECJ = "openjdk.build-ecj" - -# Force arm mode for now -ARM_INSTRUCTION_SET_armv4t = "ARM" - -# readdir_r was deprecated in glibc-2.24. Ignore the error for now -# NOTE: When updating the recipe, please check if this is still needed -BUILD_CFLAGS_append = " -Wno-error=deprecated-declarations" -TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations" - -# WORKAROUND: disable the "specified bound depends on the length of the source argument" -# compiler error until we update openjdk8 to a fixed version -BUILD_CFLAGS_append = " -Wno-error=stringop-overflow" -TARGET_CFLAGS_append = " -Wno-error=stringop-overflow" - -# Enable zero mode for arm based builds, as normal hotspot fails to build -PACKAGECONFIG_append_armv4 = " zero" -PACKAGECONFIG_append_armv5 = " zero" -PACKAGECONFIG_append_armv6 = " zero" - -OPENJDK_ARCH_PORT = "jdk8u" -OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" -OPENJDK_ARCH_PORT_armv7a = "aarch32-port" -OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" -OPENJDK_HG_U = "jdk8u" -OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" - -OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" -OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" -OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};downloadfilename=${OPENJDK_FILE_LOCAL};name=openjdk" - -HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" -HOTSPOT_FILE_LOCAL = "openjdk8-${PV}-hotspot-${HOTSPOT_FILE}" -HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};downloadfilename=${HOTSPOT_FILE_LOCAL};name=hotspot;unpack=false" - -CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" -CORBA_FILE_LOCAL = "openjdk8-${PV}-corba-${CORBA_FILE}" -CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};downloadfilename=${CORBA_FILE_LOCAL};name=corba;unpack=false" - -JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" -JAXP_FILE_LOCAL = "openjdk8-${PV}-jaxp-${JAXP_FILE}" -JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};downloadfilename=${JAXP_FILE_LOCAL};name=jaxp;unpack=false" - -JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" -JAXWS_FILE_LOCAL = "openjdk8-${PV}-jaxws-${JAXWS_FILE}" -JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};downloadfilename=${JAXWS_FILE_LOCAL};name=jaxws;unpack=false" - -JDK_FILE = "${JDK_CHANGESET}.tar.bz2" -JDK_FILE_LOCAL = "openjdk8-${PV}-jdk-${JDK_FILE}" -JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};downloadfilename=${JDK_FILE_LOCAL};name=jdk;unpack=false" - -LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" -LANGTOOLS_FILE_LOCAL = "openjdk8-${PV}-langtools-${LANGTOOLS_FILE}" -LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};downloadfilename=${LANGTOOLS_FILE_LOCAL};name=langtools;unpack=false" - -NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" -NASHORN_FILE_LOCAL = "openjdk8-${PV}-nashorn-${NASHORN_FILE}" -NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};downloadfilename=${NASHORN_FILE_LOCAL};name=nashorn;unpack=false" 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 @@ -require openjdk-8-release-172b11-common.inc - -# We do not yet work for aarch64, and we make sure -# to use the aarch32 port for ARMv7. -COMPATIBLE_HOST = "^(?!(aarch64)).*$" -COMPATIBLE_HOST_armv7a = "^$" -COMPATIBLE_HOST_armv7ve = "^$" - -CORBA_CHANGESET = "875a75c440cd" -SRC_URI[corba.md5sum] = "66242dd6e749f39a5ef6add34f5ecb2f" -SRC_URI[corba.sha256sum] = "f1618be7ad88619c7d7c1eed9800c528d0646e1c9f039e20a57b3e72ae3d3512" - -HOTSPOT_CHANGESET = "32ba4d2121c1" -SRC_URI[hotspot.md5sum] = "a3e1d2f91ba8873f71e9a72043e2644a" -SRC_URI[hotspot.sha256sum] = "680b1f5100786910bfceeef90ce28d74fcf6eacfdd3b92dfc76dcf3216060e99" - -JAXP_CHANGESET = "30586bb50743" -SRC_URI[jaxp.md5sum] = "b413b1cb709d74e513f13c586215366d" -SRC_URI[jaxp.sha256sum] = "ba36dd8ad72ff3d8bda38b7d6773037e18c3c68ebadd61f1e1f7fc167a506baa" - -JAXWS_CHANGESET = "452a6a5a878e" -SRC_URI[jaxws.md5sum] = "5c3c4d1fec19398128cf818aef5486a9" -SRC_URI[jaxws.sha256sum] = "89aa34e6bc3410a85ea697aa4ae70c21f7099efdacef78a6e5a46747421e86f9" - -JDK_CHANGESET = "5ccc572f4ffe" -SRC_URI[jdk.md5sum] = "29dd4772e3862193e56007a0bb0d6886" -SRC_URI[jdk.sha256sum] = "4d1758ceec155fcd2cd786f11071ed614947a9720373d704221d78ed98beadec" - -LANGTOOLS_CHANGESET = "34ee52bc68a4" -SRC_URI[langtools.md5sum] = "b195802f2aaa5c95c06cc50021bb42a6" -SRC_URI[langtools.sha256sum] = "0403bd2c9a45e4c0dc2148907028e0cdfd087be512e6d6b3763a01411936663a" - -NASHORN_CHANGESET = "7efd6152328e" -SRC_URI[nashorn.md5sum] = "3aa4b31fdbf330baf28194e21697b8d6" -SRC_URI[nashorn.sha256sum] = "8b5cbd29e9dbace477a57d7c07a127312dd3cf6b8e648b0b64026616d12c6862" - -OPENJDK_CHANGESET = "33d274a7dda0" -SRC_URI[openjdk.md5sum] = "105f62e8f22a68b8c4151c68a447f76e" -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..17e3a3d --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-aarch32.inc @@ -0,0 +1,52 @@ +require openjdk-8-release-common.inc + +COMPATIBLE_HOST = "^$" +COMPATIBLE_HOST:armv7a = "arm" +COMPATIBLE_HOST:armv7ve = "arm" + +CHANGESET_ID="b09-aarch32-20200929" + +CORBA_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[corba.sha256sum] = "3675f043479c7e3ee7128651527d15c4e56f72d22dd953b8d0d8e5c9a2c68741" + +HOTSPOT_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[hotspot.sha256sum] = "d5ea125d7e54fd3dd21bf1654c09b5ce17497d9327f770abd56ad1108a337b81" + +JAXP_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jaxp.sha256sum] = "a025f9f047bc50947aa631641b2f836c3a3ec4a5f2c9019bc7b11ab8444f7b9e" + +JAXWS_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jaxws.sha256sum] = "ad921e0f5cafab4c5b4bb248ea59bf1615864c4de17bfd7321759d063398dc3f" + +JDK_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jdk.sha256sum] = "835e81fc88b8c0e40df0d89be5d8a852638b3f5f29acad6997cbc36a2e8341fe" + +LANGTOOLS_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[langtools.sha256sum] = "554491026bb9fadb837d635d4beea3ca9cb73f034c1379d57fcd77787816139f" + +NASHORN_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[nashorn.sha256sum] = "8358000a7e52fcfd046027319569d17f2e99b710acbfd1a1120b50ce93afe223" + +OPENJDK_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[openjdk.sha256sum] = "4b38e672c82df5d18215849829a80a111b1c7b46567bc641e9fec92bedd0d32a" + +PACKAGECONFIG:append:armv7a = " client" +PACKAGECONFIG:append:armv7ve = " client" + +do_install:append() { + if [ -d ${D}${JDK_HOME} ] ; then + sed -e 's,^\(-server ERROR$\),# \1,' \ + -e 's,^-client IGNORE,-client ERROR,' \ + -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ + -i ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg + fi + if [ -d ${D}${JRE_HOME} ] ; then + sed -e 's,^\(-server ERROR$\),# \1,' \ + -e 's,^-client IGNORE,-client ERROR,' \ + -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ + -i ${D}${JRE_HOME}/lib/${JDK_ARCH}/jvm.cfg + fi +} + +JDK_ARCH:armv7a = "aarch32" +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..3aac110 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-aarch64.inc @@ -0,0 +1,29 @@ +require openjdk-8-release-common.inc + +COMPATIBLE_HOST = "aarch64" + +CHANGESET_ID="b10" + +CORBA_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[corba.sha256sum] = "112143d935a94cb95a0f9dba19a86184d08e699a68a82db58cdd9f0de1baeeae" + +HOTSPOT_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[hotspot.sha256sum] = "16ed30b46279e2ffef04ab392502e32525451bea38f3af0d3c3782bcd33a0274" + +JAXP_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jaxp.sha256sum] = "5dde165d7327b08f2ebc8d3081a1734d9ef737117dcaa417eb7dc39344220987" + +JAXWS_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jaxws.sha256sum] = "cedde28264a85cb16ae46123091edb64f7c1d2cd5f3de6ba0d21cffff84c3ccf" + +JDK_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jdk.sha256sum] = "7e53438e0506536fe373b7f8176512c701b87adda268831d180ead2695154a93" + +LANGTOOLS_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[langtools.sha256sum] = "8dbcd45109d0c782a6cac5a1a310a5816d4dac8a9c095635832ab803bfdb861a" + +NASHORN_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[nashorn.sha256sum] = "85497cdba0943644d838862761891d0a06dfaad5ea13b63af69f1a6d595e6387" + +OPENJDK_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[openjdk.sha256sum] = "97175c78de4c82b78d3c80b1b0d22c44b195ca067f253cfaa3c235328b808760" diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc new file mode 100644 index 0000000..ff8d96e --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-common.inc @@ -0,0 +1,137 @@ + +PATCHES_URI = "\ + file://0001-Allow-using-a-system-installed-libjpeg.patch \ + file://0002-Allow-using-a-system-installed-libpng.patch \ + file://0003-build-fix-build-on-as-needed-toolchains-generic.patch \ + file://0004-don-t-expect-fqpn-for-make.patch \ + file://0005-autoconf-filter-aclocal-copy-too.patch \ + file://0006-autoconf-handle-extra-output.patch \ + file://0007-fix-assembler-flag-handling-in-makefile.patch \ + file://0008-autoconf-fix-shark-build-common.patch \ + file://0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch \ + file://0010-autoconf-remove-shell-variables-from-autoheader.patch \ + file://0013-autoconf-remove-Werror.patch \ + ${HOTSPOT_UB_PATCH} \ + file://2001-jdk-comparison-between-pointer-and-integer.patch \ + file://2002-jdk-Allow-using-a-system-installed-libjpeg.patch \ + file://2003-jdk-Allow-using-a-system-installed-libpng.patch \ + file://2004-jdk-use-correct-include-for-poll.patch \ + file://2005-jdk-use-correct-include-for-signal.patch \ + file://2006-jdk-disable-backtrace-musl-build-fix.patch \ + file://2007-jdk-no-genx11-in-headless.patch \ + file://2008-jdk-no-unused-deps.patch \ + file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch \ +" +HOTSPOT_UB_PATCH = "\ + file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ + file://1002-hotspot-use-correct-include-for-poll.patch \ + file://1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ + file://1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ + file://1005-hotspot-Zero-build-requires-disabled-warnings.patch \ + file://1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ + file://1007-hotspot-Turn-on-the-Wreturn-type-warning.patch \ + file://1008-hotspot-handle-format-error-for-GCC-7.patch \ + file://1012-hotspot-enable-Wno-error.patch \ +" +HOTSPOT_UB_PATCH:append:class-target = "\ + file://1009-hotspot-fix-adlc-flags.patch \ + file://1010-hotspot-fix-shark-build-common.patch \ + file://1011-hotspot-restrict-to-staging-dir.patch \ +" +HOTSPOT_UB_PATCH:prepend:aarch64 = "\ + file://1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch \ +" +HOTSPOT_UB_PATCH:append:armv7a = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" +HOTSPOT_UB_PATCH:append:armv7ve = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" + +PATCHES_URI:append:class-target = "\ + file://1013-hotspot-add-missing-includes-for-shark-build-pt2.patch \ +" + +PATCHES_URI:append:libc-musl = "\ + ${OBSOLETE_ISNANF_PATCH} \ + file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ + file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ + file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ + file://musl-0005-hotspot-disable-agent-build-common.patch \ + ${DISABLE_AGENT_BUILD_PT2} \ + file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \ + ${REMOVE_GLIBC_DEPENDENCIES_PT2} \ + file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ + file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ + file://musl-0009-jdk-musl-has-gethostby_r.patch \ +" +OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch" +OBSOLETE_ISNANF_PATCH:armv7a = "" +OBSOLETE_ISNANF_PATCH:armv7ve = "" +DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch" +DISABLE_AGENT_BUILD_PT2:armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" +DISABLE_AGENT_BUILD_PT2:armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" +REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch" +REMOVE_GLIBC_DEPENDENCIES_PT2:armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" +REMOVE_GLIBC_DEPENDENCIES_PT2:armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" + +PATCHES_URI:append:libc-musl:armv7a = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" +PATCHES_URI:append:libc-musl:armv7ve = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" +PATCHES_URI:append:libc-musl:aarch64 = " file://1402-hotspot-aarch64-remaining-musl-fixes.patch" + +# remove aarch32 & aarch64 mainlined patches +PATCHES_URI:remove:armv7a = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" +PATCHES_URI:remove:armv7ve = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" +PATCHES_URI:remove:aarch64 = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" + +# Name of the directory containing the compiled output +BUILD_DIR = "openjdk.build" +BUILD_DIR_ECJ = "openjdk.build-ecj" + +# Force arm mode for now +ARM_INSTRUCTION_SET:armv4t = "ARM" + +# Enable zero mode for arm based builds, as normal hotspot fails to build +PACKAGECONFIG:append:armv4 = " zero" +PACKAGECONFIG:append:armv5 = " zero" +PACKAGECONFIG:append:armv6 = " zero" + +OPENJDK_ARCH_PORT = "jdk8u" +OPENJDK_ARCH_PORT:aarch64 = "aarch64-port" +OPENJDK_ARCH_PORT:armv7a = "aarch32-port" +OPENJDK_ARCH_PORT:armv7ve = "aarch32-port" +OPENJDK_HG_U = "jdk8u" + +# the aarch64 port moved, for more information see: +# https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html +OPENJDK_HG_U:aarch64 = "jdk8u-shenandoah" + +OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" + +OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" +OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" +OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};downloadfilename=${OPENJDK_FILE_LOCAL};name=openjdk" + +HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" +HOTSPOT_FILE_LOCAL = "openjdk8-${PV}-hotspot-${HOTSPOT_FILE}" +HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};downloadfilename=${HOTSPOT_FILE_LOCAL};name=hotspot;unpack=false" + +CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" +CORBA_FILE_LOCAL = "openjdk8-${PV}-corba-${CORBA_FILE}" +CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};downloadfilename=${CORBA_FILE_LOCAL};name=corba;unpack=false" + +JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" +JAXP_FILE_LOCAL = "openjdk8-${PV}-jaxp-${JAXP_FILE}" +JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};downloadfilename=${JAXP_FILE_LOCAL};name=jaxp;unpack=false" + +JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" +JAXWS_FILE_LOCAL = "openjdk8-${PV}-jaxws-${JAXWS_FILE}" +JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};downloadfilename=${JAXWS_FILE_LOCAL};name=jaxws;unpack=false" + +JDK_FILE = "${JDK_CHANGESET}.tar.bz2" +JDK_FILE_LOCAL = "openjdk8-${PV}-jdk-${JDK_FILE}" +JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};downloadfilename=${JDK_FILE_LOCAL};name=jdk;unpack=false" + +LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" +LANGTOOLS_FILE_LOCAL = "openjdk8-${PV}-langtools-${LANGTOOLS_FILE}" +LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};downloadfilename=${LANGTOOLS_FILE_LOCAL};name=langtools;unpack=false" + +NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" +NASHORN_FILE_LOCAL = "openjdk8-${PV}-nashorn-${NASHORN_FILE}" +NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};downloadfilename=${NASHORN_FILE_LOCAL};name=nashorn;unpack=false" diff --git a/recipes-core/openjdk/openjdk-8-release.inc b/recipes-core/openjdk/openjdk-8-release.inc new file mode 100644 index 0000000..4cdd050 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release.inc @@ -0,0 +1,31 @@ +require openjdk-8-release-common.inc + +# We do not yet work for aarch64, and we make sure +# to use the aarch32 port for ARMv7. +COMPATIBLE_HOST = "^(?!(aarch64)).*$" +COMPATIBLE_HOST:armv7a = "^$" +COMPATIBLE_HOST:armv7ve = "^$" + +CORBA_CHANGESET = "jdk8u${PV}-ga" +SRC_URI[corba.sha256sum] = "28c487a49546ab1a592eaf229c13e1896b390958ac4e6fa19bf5da34a1977138" + +HOTSPOT_CHANGESET = "jdk8u${PV}-ga" +SRC_URI[hotspot.sha256sum] = "55db6eb423445978e5a9a285c5adea238dec3d3998dc5f1216f8f5c7a8d7c5ea" + +JAXP_CHANGESET = "jdk8u${PV}-ga" +SRC_URI[jaxp.sha256sum] = "778d3946b9cf84c9b7fd937dc91d0e919ba7616cc4e3db44b9d0347ecdad308a" + +JAXWS_CHANGESET = "jdk8u${PV}-ga" +SRC_URI[jaxws.sha256sum] = "a46eabbed4fedcdbd26510fc1ccf40aaa337e44542f112d4dba3e93f2bb7e492" + +JDK_CHANGESET = "jdk8u${PV}-ga" +SRC_URI[jdk.sha256sum] = "9913adf85d3c5b039a5dfeb0962613d92c6f454d0bbbbe3e5341e221021e908e" + +LANGTOOLS_CHANGESET = "jdk8u${PV}-ga" +SRC_URI[langtools.sha256sum] = "9189920ae3858c9a680912c54504302e0553cf25d892c8a03fe954859f587066" + +NASHORN_CHANGESET = "jdk8u${PV}-ga" +SRC_URI[nashorn.sha256sum] = "b42bed287349ecc702f874867a60c3e3664a799d69004e46260db5ff9a7df772" + +OPENJDK_CHANGESET = "jdk8u${PV}-ga" +SRC_URI[openjdk.sha256sum] = "3b335df278915237986ccdfc40e262d5b6a711072b2a0b99bf2b197dc9ff0cff" diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb b/recipes-core/openjdk/openjdk-8_272.bb index 72f208e..0bfa102 100644 --- a/recipes-core/openjdk/openjdk-8_172b11.bb +++ b/recipes-core/openjdk/openjdk-8_272.bb @@ -1,8 +1,8 @@ INC_FILE_SUFFIX = "" -INC_FILE_SUFFIX_aarch64 = "-aarch64" -INC_FILE_SUFFIX_armv7a = "-aarch32" -INC_FILE_SUFFIX_armv7ve = "-aarch32" -require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc +INC_FILE_SUFFIX:aarch64 = "-aarch64" +INC_FILE_SUFFIX:armv7a = "-aarch32" +INC_FILE_SUFFIX:armv7ve = "-aarch32" +require openjdk-8-release${INC_FILE_SUFFIX}.inc require openjdk-8-cross.inc do_install() { @@ -11,15 +11,15 @@ do_install() { cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME} chown -R root:root ${D}${JDK_HOME} install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ - find ${D}${JDK_HOME} -name "*.debuginfo" -print0 | xargs -0 rm + find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \; } -PACKAGES_append = " \ +PACKAGES:append = " \ ${PN}-demo \ ${PN}-source \ " -FILES_${PN}_append = "\ +FILES:${PN}:append = "\ ${JDK_HOME}/bin/[a-z]* \ ${JDK_HOME}/lib/[a-z]* \ ${JDK_HOME}/jre/bin/[a-z]* \ @@ -29,14 +29,14 @@ FILES_${PN}_append = "\ ${JDK_HOME}/release \ " -FILES_${PN}-dev_append = "\ +FILES:${PN}-dev:append = "\ ${JDK_HOME}/include \ " -FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " -RDEPENDS_${PN}-demo = " ${PN} " +FILES:${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " +RDEPENDS:${PN}-demo = " ${PN} " -FILES_${PN}-doc_append = "\ +FILES:${PN}-doc:append = "\ ${JDK_HOME}/man \ ${JDK_HOME}/ASSEMBLY_EXCEPTION \ ${JDK_HOME}/THIRD_PARTY_README \ @@ -45,17 +45,20 @@ FILES_${PN}-doc_append = "\ ${JDK_HOME}/man \ " -FILES_${PN}-source = " ${JDK_HOME}/src.zip " +FILES:${PN}-source = " ${JDK_HOME}/src.zip " -RPROVIDES_${PN} = "java2-runtime" +RPROVIDES:${PN} = "java2-runtime" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "java javac" +ALTERNATIVE:${PN} = "java javac keytool" ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" + +ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool" +ALTERNATIVE_TARGET[keytool] = "${JDK_HOME}/bin/keytool" diff --git a/recipes-core/openjdk/openjre-8_172b11.bb b/recipes-core/openjdk/openjre-8_272.bb index e9b930b..c1789aa 100644 --- a/recipes-core/openjdk/openjre-8_172b11.bb +++ b/recipes-core/openjdk/openjre-8_272.bb @@ -1,8 +1,8 @@ INC_FILE_SUFFIX = "" -INC_FILE_SUFFIX_aarch64 = "-aarch64" -INC_FILE_SUFFIX_armv7a = "-aarch32" -INC_FILE_SUFFIX_armv7ve = "-aarch32" -require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc +INC_FILE_SUFFIX:aarch64 = "-aarch64" +INC_FILE_SUFFIX:armv7a = "-aarch32" +INC_FILE_SUFFIX:armv7ve = "-aarch32" +require openjdk-8-release${INC_FILE_SUFFIX}.inc require openjdk-8-cross.inc do_install() { @@ -11,17 +11,16 @@ do_install() { cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME} chown -R root:root ${D}${JRE_HOME} install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ - find ${D}${JRE_HOME} -name "*.debuginfo" -print0 | xargs -0 rm } -FILES_${PN}_append = "\ +FILES:${PN}:append = "\ ${JRE_HOME}/bin/[a-z]* \ ${JRE_HOME}/lib/[a-z]* \ ${JRE_HOME}/LICENSE \ ${JRE_HOME}/release \ " -FILES_${PN}-dbg_append = "\ +FILES:${PN}-dbg:append = "\ ${JRE_HOME}/bin/.debug/ \ ${JRE_HOME}/lib/.debug/ \ ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \ @@ -29,17 +28,21 @@ FILES_${PN}-dbg_append = "\ ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \ " -FILES_${PN}-doc_append = "\ +FILES:${PN}-doc:append = "\ ${JRE_HOME}/man \ ${JRE_HOME}/ASSEMBLY_EXCEPTION \ ${JRE_HOME}/THIRD_PARTY_README \ " -RPROVIDES_${PN} = "java2-runtime" +RPROVIDES:${PN} = "java2-runtime" inherit update-alternatives -ALTERNATIVE_${PN} = "java" +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE:${PN} = "java keytool" ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" -ALTERNATIVE_PRIORITY[java] = "100" + +ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool" +ALTERNATIVE_TARGET[keytool] = "${JRE_HOME}/bin/keytool" diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-fix-xattr-include.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-fix-xattr-include.patch new file mode 100644 index 0000000..ef44e7e --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-fix-xattr-include.patch @@ -0,0 +1,11 @@ +--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c ++++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c +@@ -38,7 +38,7 @@ + + #ifdef COMPILE_AGAINST_SYSCALLS + #include <sys/types.h> +-#include <attr/xattr.h> ++#include <sys/xattr.h> + #else + #include <syscalls_fp.h> + #endif diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-m4-fix-xattr-include-path.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-m4-fix-xattr-include-path.patch new file mode 100644 index 0000000..f9b526f --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-m4-fix-xattr-include-path.patch @@ -0,0 +1,11 @@ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2234,7 +2234,7 @@ + dnl Check for syscalls + AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],, + [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])]) +- AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h], ++ AC_CHECK_HEADERS([sys/epoll.h sys/xattr.h], + , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary.])]) + ENABLE_SYSCALL_COMPILATION=true + fi 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..00ce23f --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch @@ -0,0 +1,75 @@ +From 74366a35d754d2dacab28d36804b5cde5dec481b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Tue, 27 Feb 2018 13:36:53 +0000 +Subject: [PATCH] Allow using a system-installed libjpeg +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Patch stolen (and some typos corrected) from debian patch, +which itself was a backport from: + http://hg.openjdk.java.net/jdk9/client/rev/bfd9a3e1aeb5 + http://hg.openjdk.java.net/jdk9/client/jdk/rev/320743f0b4fc + +Issues fixed on top of debian patch: + * imageIOJPEG.c -> imageioJPEG.c + * $(LIBJPEG_LIBS) must be added to LDFLAGS_SUFFIX, not + LDFLAGS as it otherwise doesn't make it into the linker + command line and then fails when using -Wl,-z,now in + LDFLAGS (as done when 'security' is enabled) + +Upstream-Status: Backport + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++----- + 1 file changed, 30 insertions(+), 5 deletions(-) + +diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 +index 6d803f9b..d2732eb8 100644 +--- a/common/autoconf/libraries.m4 ++++ b/common/autoconf/libraries.m4 +@@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], + # Check for the jpeg library + # + +- USE_EXTERNAL_LIBJPEG=true +- AC_CHECK_LIB(jpeg, main, [], +- [ USE_EXTERNAL_LIBJPEG=false +- AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source]) +- ]) ++ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg], ++ [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) ++ ++ AC_MSG_CHECKING([for which libjpeg to use]) ++ ++ # default is bundled ++ DEFAULT_LIBJPEG=bundled ++ ++ # ++ # if user didn't specify, use DEFAULT_LIBJPEG ++ # ++ if test "x${with_libjpeg}" = "x"; then ++ with_libjpeg=${DEFAULT_LIBJPEG} ++ fi ++ ++ AC_MSG_RESULT(${with_libjpeg}) ++ ++ if test "x${with_libjpeg}" = "xbundled"; then ++ USE_EXTERNAL_LIBJPEG=false ++ elif test "x${with_libjpeg}" = "xsystem"; then ++ AC_CHECK_HEADER(jpeglib.h, [], ++ [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])]) ++ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [], ++ [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])]) ++ ++ USE_EXTERNAL_LIBJPEG=true ++ else ++ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled']) ++ fi ++ + AC_SUBST(USE_EXTERNAL_LIBJPEG) + + ############################################################################### 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..64f4bce --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch @@ -0,0 +1,78 @@ +From 048b9cb7910cf2f04f73483dd9755aeb50017e6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Thu, 2 Jan 2020 13:40:50 +0100 +Subject: [PATCH] Allow using a system-installed libpng +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Patch stolen (and some typos corrected) from debian patch, +which itself was a backport from: + http://hg.openjdk.java.net/jdk9/jdk9/rev/bfc1c131e540 + http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5e503831b142 + +Issues fixed on top of debian patch: + * the default when --with-libpng= is not given works + * using the bundled libpng works + +Upstream-Status: Backport + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 +index d2732eb8..727f0181 100644 +--- a/common/autoconf/libraries.m4 ++++ b/common/autoconf/libraries.m4 +@@ -843,6 +843,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], + fi + AC_SUBST(USE_EXTERNAL_LIBGIF) + ++ ############################################################################### ++ # ++ # Check for the png library ++ # ++ ++ AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng], ++ [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) ++ ++ AC_CHECK_LIB(png, png_sig_cmp, ++ [ LIBPNG_FOUND=yes ], ++ [ LIBPNG_FOUND=no ]) ++ ++ AC_MSG_CHECKING([for which libpng to use]) ++ ++ # default is bundled ++ DEFAULT_LIBPNG=bundled ++ ++ # ++ # if user didn't specify, use DEFAULT_LIBPNG ++ # ++ if test "x${with_libpng}" = "x"; then ++ with_libpng=${DEFAULT_LIBPNG} ++ fi ++ ++ ++ if test "x${with_libpng}" = "xbundled"; then ++ USE_EXTERNAL_LIBPNG=false ++ AC_MSG_RESULT([bundled]) ++ elif test "x${with_libpng}" = "xsystem"; then ++ if test "x${LIBPNG_FOUND}" = "xyes"; then ++ USE_EXTERNAL_LIBPNG=true ++ AC_MSG_RESULT([system]) ++ else ++ AC_MSG_RESULT([system not found]) ++ AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!]) ++ fi ++ else ++ AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled']) ++ fi ++ AC_SUBST(USE_EXTERNAL_LIBPNG) ++ + ############################################################################### + # + # Check for the zlib library 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 @@ -From bdea8cf299313388ec41ea20281deca6dc4f764d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Tue, 27 Feb 2018 14:41:06 +0000 -Subject: [PATCH 2/9] hotspot: fix compilation with security flags enabled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| hotspot/src/share/vm/code/dependencies.cpp: In function 'static void Dependencies::write_dependency_to(xmlStream*, Dependencies::DepType, GrowableArray<Dependencies::DepArgument>*, Klass*)': -| 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=] -| void Dependencies::write_dependency_to(xmlStream* xtty, -| ^~~~~~~~~~~~ -| hotspot/src/share/vm/code/dependencies.cpp:498:6: note: directive argument in the range [0, 2147483647] -| hotspot/src/share/vm/code/dependencies.cpp:528:27: note: 'sprintf' output between 3 and 12 bytes into a destination of size 10 -| char xn[10]; sprintf(xn, "x%d", j); -| ~~~~~~~^~~~~~~~~~~~~~ - -Backport a patch to fix this. - -Upstream-Status: Backport [http://hg.openjdk.java.net/jdk10/jdk10/hotspot/rev/eb11b3f0ae65] -Signed-off-by: André Draszik <andre.draszik@jci.com> ---- - hotspot/src/share/vm/code/dependencies.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hotspot/src/share/vm/code/dependencies.cpp b/hotspot/src/share/vm/code/dependencies.cpp -index 7317036d..c71d921d 100644 ---- a/hotspot/src/share/vm/code/dependencies.cpp -+++ b/hotspot/src/share/vm/code/dependencies.cpp -@@ -525,7 +525,7 @@ void Dependencies::write_dependency_to(xmlStream* xtty, - xtty->object("x", arg.metadata_value()); - } - } else { -- char xn[10]; sprintf(xn, "x%d", j); -+ char xn[12]; sprintf(xn, "x%d", j); - if (arg.is_oop()) { - xtty->object(xn, arg.oop_value()); - } else { --- -2.16.2 - 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..0ab4b7d 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,4 +1,4 @@ -From 84bcdb9cdab0e0be9cdfededfb518d3cea9009e3 Mon Sep 17 00:00:00 2001 +From 34bfdbabf0b2d9b1d0965b5fe362fd9596f58527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 12 Mar 2018 15:40:58 +0000 Subject: [PATCH] build: fix build on --as-needed toolchains (generic) @@ -65,16 +65,17 @@ any additional libraries, so as to fix this once and for all. Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- -Upstream-Status: Pending make/common/NativeCompilation.gmk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk -index e7ea22ce..79f081fd 100644 +index d961cf35..92f8033f 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk -@@ -477,9 +477,8 @@ define SetupNativeCompilation +@@ -618,9 +618,8 @@ endif # no MacOS X support yet $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) $$(call LINKING_EXE_MSG,$$($1_BASENAME)) @@ -86,6 +87,3 @@ index e7ea22ce..79f081fd 100644 ifneq (,$$($1_GEN_MANIFEST)) $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 endif --- -2.16.2 - 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..eab00d2 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,19 @@ ---- common/autoconf/basics.m4.orig -+++ common/autoconf/basics.m4 -@@ -555,10 +555,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], +From a99cf53a082c1b25f5f7159c65bfd2c27a63fe75 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 13:42:43 +0100 +Subject: [PATCH] don't expect fqpn for make + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + common/autoconf/basics.m4 | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 +index 4ee9cdd1..c20ea765 100644 +--- a/common/autoconf/basics.m4 ++++ b/common/autoconf/basics.m4 +@@ -740,10 +740,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. if test "x$MAKE" != x; then # User has supplied a make, test it. 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..1a0f6e3 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch @@ -0,0 +1,23 @@ +From 37a7b95ab512ddeb635b6b8e23e4bac089ccee38 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 13:44:25 +0100 +Subject: [PATCH] autoconf: filter aclocal copy too + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + common/autoconf/basics.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 +index c20ea765..8e06cd25 100644 +--- a/common/autoconf/basics.m4 ++++ b/common/autoconf/basics.m4 +@@ -636,6 +636,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], + | $SED -e 's/config.log//g' \ + -e 's/confdefs.h//g' \ + -e 's/fixpath.exe//g' \ ++ -e 's,aclocal-copy,,g' \ + -e 's/ //g' \ + | $TR -d '\n'` + if test "x$filtered_files" != x; then 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..d24ed71 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,22 @@ +From be1397b2106874869eebfc0b21943f1976a97f1b Mon Sep 17 00:00:00 2001 +From: Haiqing Bai <Haiqing.Bai@windriver.com> +Date: Thu, 2 Jan 2020 13:45:42 +0100 +Subject: [PATCH] autoconf: handle extra output + When adding the environment variable JAVA_TOOL_OPTIONS an extra line in the output from 'java -version' is produced. As this output is parsed by configure script the extra line has to be filtered out. ---- jdk8u-4be07cb28b21.orig/common/autoconf/boot-jdk.m4 -+++ jdk8u-4be07cb28b21/common/autoconf/boot-jdk.m4 +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + common/autoconf/boot-jdk.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 +index 5be15b86..0d1a6e14 100644 +--- a/common/autoconf/boot-jdk.m4 ++++ b/common/autoconf/boot-jdk.m4 @@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], BOOT_JDK_FOUND=no else 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..b7e84b2 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch @@ -0,0 +1,34 @@ +From 2206e1d037359cf4f08a6c7b944d6735b56ea36d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> +Date: Thu, 2 Jan 2020 13:49:02 +0100 +Subject: [PATCH] fix assembler flag handling in makefile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Delay $CXX insertion until after make has evaluated the comma-separated +list, as any comma separated parameters in CXX (such as assembler arguments) +would break the build + +Upstream-Status: Pending + +Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + make/common/NativeCompilation.gmk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk +index 92f8033f..46a1be91 100644 +--- a/make/common/NativeCompilation.gmk ++++ b/make/common/NativeCompilation.gmk +@@ -391,7 +391,7 @@ define SetupNativeCompilation + $$(foreach p,$$($1_SRCS), \ + $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ + $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \ +- $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS)))) ++ $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$$(CXX),$$($1_ASFLAGS)))) + + # On windows we need to create a resource file + ifeq ($(OPENJDK_TARGET_OS), windows) 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..9cf468e --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch @@ -0,0 +1,35 @@ +From bc54b9fbe29c524c07377fb8a87922be55c61700 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 13:51:40 +0100 +Subject: [PATCH] autoconf: fix shark build (common) + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + common/autoconf/libraries.m4 | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 +index 727f0181..91d2b5ca 100644 +--- a/common/autoconf/libraries.m4 ++++ b/common/autoconf/libraries.m4 +@@ -1079,8 +1079,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], + fi + fi + done +- llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//') ++ llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//; s/\..*$//') + LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}" ++ AS_IF([test $llvm_version -ge 34], [LLVM_CFLAGS="${LLVM_CFLAGS} -std=gnu++11"]) + + unset LLVM_LDFLAGS + for flag in $("${LLVM_CONFIG}" --ldflags); do +@@ -1093,7 +1094,7 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], + done + + unset LLVM_LIBS +- for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do ++ for flag in $("${LLVM_CONFIG}" --libs --system-libs ${llvm_components}); do + if echo "${flag}" | grep -q '^-l'; then + if test "${LLVM_LIBS}" != ""; then + LLVM_LIBS="${LLVM_LIBS} " 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..ff6180f 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 @@ ---- make/common/NativeCompilation.gmk.orig -+++ make/common/NativeCompilation.gmk -@@ -438,58 +438,6 @@ define SetupNativeCompilation - $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% +From 038f36c083a83916504b8b59c80099fbeb9a68d6 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 13:53:50 +0100 +Subject: [PATCH] prevent debuginfo in favour of openembedded package split + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + make/common/NativeCompilation.gmk | 122 ------------------------------ + 1 file changed, 122 deletions(-) + +diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk +index 46a1be91..b4ea2c6f 100644 +--- a/make/common/NativeCompilation.gmk ++++ b/make/common/NativeCompilation.gmk +@@ -456,67 +456,6 @@ define SetupNativeCompilation $(CP) $$< $$@ endif -- + - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows - ifeq ($(OPENJDK_TARGET_OS), solaris) -- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. -- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from -- # empty section headers until a fixed $(OBJCOPY) is available. -- # An empty section header has sh_addr == 0 and sh_size == 0. -- # This problem has only been seen on Solaris X64, but we call this tool -- # on all Solaris builds just in case. -- # -- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. -- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. -- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ +- ifneq ($$($1_STRIP_POLICY), no_strip) +- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. +- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from +- # empty section headers until a fixed $(OBJCOPY) is available. +- # An empty section header has sh_addr == 0 and sh_size == 0. +- # This problem has only been seen on Solaris X64, but we call this tool +- # on all Solaris builds just in case. +- # +- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. +- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. +- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) - $(RM) $$@ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< - $(OBJCOPY) --only-keep-debug $$< $$@ - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< +- endif - else # not solaris -- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) - $(RM) $$@ - $(OBJCOPY) --only-keep-debug $$< $$@ - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< +- endif - endif # Touch to not retrigger rule on rebuild +- ifneq ($$($1_STRIP_POLICY), no_strip) - $(TOUCH) $$@ +- endif - endif # !windows - endif # !macosx - - ifeq ($(ZIP_DEBUGINFO_FILES), true) -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet +-ifneq ($$($1_STRIP_POLICY), no_strip) - $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz - - ifeq ($(OPENJDK_TARGET_OS), windows) @@ -47,53 +66,62 @@ - $(CD) $$($1_OBJECT_DIR) \ - && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo - endif +-endif # not possible when stripping is disabled -endif # no MacOS X support yet - else - ifeq ($(OPENJDK_TARGET_OS), windows) - $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ - $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files -- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo +- endif - endif - endif endif endif -@@ -522,58 +470,6 @@ endif # no MacOS X support yet - $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% +@@ -550,67 +489,6 @@ endif # no MacOS X support yet $(CP) $$< $$@ endif -- + - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows - ifeq ($(OPENJDK_TARGET_OS), solaris) -- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. -- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from -- # empty section headers until a fixed $(OBJCOPY) is available. -- # An empty section header has sh_addr == 0 and sh_size == 0. -- # This problem has only been seen on Solaris X64, but we call this tool -- # on all Solaris builds just in case. -- # -- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. -- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. -- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ +- ifneq ($$($1_STRIP_POLICY), no_strip) +- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. +- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from +- # empty section headers until a fixed $(OBJCOPY) is available. +- # An empty section header has sh_addr == 0 and sh_size == 0. +- # This problem has only been seen on Solaris X64, but we call this tool +- # on all Solaris builds just in case. +- # +- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. +- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. +- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) - $(RM) $$@ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< - $(OBJCOPY) --only-keep-debug $$< $$@ - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< +- endif - else # not solaris -- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) - $(RM) $$@ - $(OBJCOPY) --only-keep-debug $$< $$@ - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< +- endif - endif +- ifneq ($$($1_STRIP_POLICY), no_strip) - $(TOUCH) $$@ +- endif - endif # !windows - endif # !macosx - - ifeq ($(ZIP_DEBUGINFO_FILES), true) -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet +-ifneq ($$($1_STRIP_POLICY), no_strip) - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz - - ifeq ($(OPENJDK_TARGET_OS), windows) @@ -106,13 +134,16 @@ - $(CD) $$($1_OBJECT_DIR) \ - && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo - endif +-endif -endif # no MacOS X support yet - else - ifeq ($(OPENJDK_TARGET_OS), windows) - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ - $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files -- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo +- endif - endif - endif endif 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..ff9346c 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,19 @@ ---- common/autoconf/basics.m4.orig -+++ common/autoconf/basics.m4 -@@ -472,21 +472,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], +From b6e88ffb6c4a8d84da643fa9cb29c086f7c02584 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 13:55:29 +0100 +Subject: [PATCH] autoconf: remove shell variables from autoheader + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + common/autoconf/basics.m4 | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 +index 8e06cd25..c220bba7 100644 +--- a/common/autoconf/basics.m4 ++++ b/common/autoconf/basics.m4 +@@ -661,21 +661,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) # Most of the probed defines are put into config.h @@ -26,6 +39,6 @@ # which will look for generated configurations - AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) + AC_CONFIG_FILES([Makefile:Makefile.in]) + ]) - # Save the arguments given to us - echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments + AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], 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..88d2192 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch @@ -0,0 +1,61 @@ +From e878eea93b95d82d3ea13f4122f4f74cd2f8f3df Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 22 Oct 2020 09:23:06 +0200 +Subject: [PATCH 11/13] autoconf: fix CC with arguments detection + +Fix the compiler binary detection for exported CC variables with +arguments in them. + +Upstream-Status: Pending + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + common/autoconf/toolchain.m4 | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 +index c0a4af5..28da6ea 100644 +--- a/common/autoconf/toolchain.m4 ++++ b/common/autoconf/toolchain.m4 +@@ -478,23 +478,30 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], + SEARCH_LIST="$3" + + if test "x[$]$1" != x; then ++ # split compiler program and arguments ++ CBIN=`cut -d ' ' -f1 <<<"[$]$1"` ++ CARGS=`cut -d ' ' -f2- <<<"[$]$1"` ++ + # User has supplied compiler name already, always let that override. +- AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1]) +- if test "x`basename [$]$1`" = "x[$]$1"; then ++ AC_MSG_NOTICE([Will use user supplied compiler ($CBIN) $1=[$]$1]) ++ if test "x`basename $CBIN`" = "x$CBIN"; then + # A command without a complete path is provided, search $PATH. + +- AC_PATH_PROGS(POTENTIAL_$1, [$]$1) +- if test "x$POTENTIAL_$1" != x; then +- $1=$POTENTIAL_$1 ++ AC_PATH_PROGS(POTENTIAL_CBIN, $CBIN) ++ if test "x$POTENTIAL_CBIN" != x; then ++ CBIN=$POTENTIAL_CBIN + else +- AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found]) ++ AC_MSG_ERROR([User supplied compiler $1=$CBIN could not be found]) + fi + else + # Otherwise it might already be a complete path +- if test ! -x "[$]$1"; then +- AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist]) ++ if test ! -x "$CBIN"; then ++ AC_MSG_ERROR([User supplied compiler $1=$CBIN does not exist]) + fi + fi ++ ++ $1="$CBIN $CARGS" ++ AC_MSG_NOTICE([Mapped user supplied compiler to $1=[$]$1]) + else + # No user supplied value. Locate compiler ourselves. + +-- +2.26.2 + 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/0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch deleted file mode 100644 index 4ab0d7a..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch +++ /dev/null @@ -1,181 +0,0 @@ -From cc8fb308b36d323ee8a1e3a60e4c2ac006f710ab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Fri, 10 Aug 2018 14:54:45 +0100 -Subject: [PATCH] hotspot: backport patch to fix misuses of strncpy/strncat -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Various small fixes around strncpy and strncat - -Compilation using gcc >= 8 fails because of errors regarding -misuse of string functions. -Fix them using a backport from openjdk-10 - -Modelled after http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f - -Signed-off-by: André Draszik <andre.draszik@jci.com> - ---- -Upstream-Status: Backport [http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f] - hotspot/agent/src/os/linux/libproc_impl.c | 7 ++++++- - hotspot/src/share/tools/hsdis/hsdis.c | 1 + - hotspot/src/share/vm/compiler/compileBroker.hpp | 3 ++- - hotspot/src/share/vm/compiler/disassembler.cpp | 1 + - hotspot/src/share/vm/runtime/arguments.cpp | 13 ++++++------- - hotspot/src/share/vm/utilities/ostream.cpp | 14 +++++++++----- - hotspot/src/share/vm/utilities/vmError.cpp | 9 +-------- - 7 files changed, 26 insertions(+), 22 deletions(-) - -diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c -index 2ea0d0f8..ab23fb16 100644 ---- a/hotspot/agent/src/os/linux/libproc_impl.c -+++ b/hotspot/agent/src/os/linux/libproc_impl.c -@@ -162,7 +162,12 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, - return NULL; - } - -- strncpy(newlib->name, libname, sizeof(newlib->name)); -+ if (strlen(libname) >= sizeof(newlib->name)) { -+ print_debug("libname %s too long\n", libname); -+ return NULL; -+ } -+ strcpy(newlib->name, libname); -+ - newlib->base = base; - - if (fd == -1) { -diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c -index b56330e4..4e6fd9af 100644 ---- a/hotspot/src/share/tools/hsdis/hsdis.c -+++ b/hotspot/src/share/tools/hsdis/hsdis.c -@@ -410,6 +410,7 @@ static void parse_caller_options(struct hsdis_app_data* app_data, const char* ca - } - p = q; - } -+ *iop = '\0'; - } - - static void print_help(struct hsdis_app_data* app_data, -diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp -index 7a381cd3..2aea6dd1 100644 ---- a/hotspot/src/share/vm/compiler/compileBroker.hpp -+++ b/hotspot/src/share/vm/compiler/compileBroker.hpp -@@ -173,7 +173,8 @@ class CompilerCounters : public CHeapObj<mtCompiler> { - // these methods should be called in a thread safe context - - void set_current_method(const char* method) { -- strncpy(_current_method, method, (size_t)cmname_buffer_length); -+ strncpy(_current_method, method, (size_t)cmname_buffer_length-1); -+ _current_method[cmname_buffer_length-1] = '\0'; - if (UsePerfData) _perf_current_method->set_value(method); - } - -diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp -index 69974763..111214a9 100644 ---- a/hotspot/src/share/vm/compiler/disassembler.cpp -+++ b/hotspot/src/share/vm/compiler/disassembler.cpp -@@ -298,6 +298,7 @@ address decode_env::handle_event(const char* event, address arg) { - strlen((const char*)arg) > sizeof(buffer) - 1) { - // Only print this when the mach changes - strncpy(buffer, (const char*)arg, sizeof(buffer) - 1); -+ buffer[sizeof(buffer) - 1] = '\0'; - output()->print_cr("[Disassembling for mach='%s']", arg); - } - } else if (match(event, "format bytes-per-line")) { -diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp -index cccff7a8..7589b443 100644 ---- a/hotspot/src/share/vm/runtime/arguments.cpp -+++ b/hotspot/src/share/vm/runtime/arguments.cpp -@@ -3430,7 +3430,7 @@ void Arguments::fix_appclasspath() { - } - - char* copy = AllocateHeap(strlen(src) + 1, mtInternal); -- strncpy(copy, src, strlen(src) + 1); -+ strcpy(copy, src); - - // trim all trailing empty paths - for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) { -@@ -3804,17 +3804,16 @@ static char* get_shared_archive_path() { - if (end != NULL) *end = '\0'; - size_t jvm_path_len = strlen(jvm_path); - size_t file_sep_len = strlen(os::file_separator()); -- shared_archive_path = NEW_C_HEAP_ARRAY(char, jvm_path_len + -- file_sep_len + 20, mtInternal); -+ const size_t len = jvm_path_len + file_sep_len + 20; -+ shared_archive_path = NEW_C_HEAP_ARRAY(char, len, mtInternal); - if (shared_archive_path != NULL) { -- strncpy(shared_archive_path, jvm_path, jvm_path_len + 1); -- strncat(shared_archive_path, os::file_separator(), file_sep_len); -- strncat(shared_archive_path, "classes.jsa", 11); -+ jio_snprintf(shared_archive_path, len, "%s%sclasses.jsa", -+ jvm_path, os::file_separator()); - } - } else { - shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(SharedArchiveFile) + 1, mtInternal); - if (shared_archive_path != NULL) { -- strncpy(shared_archive_path, SharedArchiveFile, strlen(SharedArchiveFile) + 1); -+ strcpy(shared_archive_path, SharedArchiveFile); - } - } - return shared_archive_path; -diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp -index 44ce683d..bc3773fe 100644 ---- a/hotspot/src/share/vm/utilities/ostream.cpp -+++ b/hotspot/src/share/vm/utilities/ostream.cpp -@@ -112,7 +112,7 @@ const char* outputStream::do_vsnprintf(char* buffer, size_t buflen, - } - if (add_cr) { - if (result != buffer) { -- strncpy(buffer, result, buflen); -+ memcpy(buffer, result, result_len); - result = buffer; - } - buffer[result_len++] = '\n'; -@@ -337,15 +337,19 @@ void stringStream::write(const char* s, size_t len) { - assert(rm == NULL || Thread::current()->current_resource_mark() == rm, - "stringStream is re-allocated with a different ResourceMark"); - buffer = NEW_RESOURCE_ARRAY(char, end); -- strncpy(buffer, oldbuf, buffer_pos); -+ if (buffer_pos > 0) { -+ memcpy(buffer, oldbuf, buffer_pos); -+ } - buffer_length = end; - } - } - // invariant: buffer is always null-terminated - guarantee(buffer_pos + write_len + 1 <= buffer_length, "stringStream oob"); -- buffer[buffer_pos + write_len] = 0; -- strncpy(buffer + buffer_pos, s, write_len); -- buffer_pos += write_len; -+ if (write_len > 0) { -+ buffer[buffer_pos + write_len] = 0; -+ memcpy(buffer + buffer_pos, s, write_len); -+ buffer_pos += write_len; -+ } - - // Note that the following does not depend on write_len. - // This means that position and count get updated -diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp -index 15f6bf48..4ab85f5d 100644 ---- a/hotspot/src/share/vm/utilities/vmError.cpp -+++ b/hotspot/src/share/vm/utilities/vmError.cpp -@@ -421,14 +421,7 @@ void VMError::report(outputStream* st) { - #else - const char *file = _filename; - #endif -- size_t len = strlen(file); -- size_t buflen = sizeof(buf); -- -- strncpy(buf, file, buflen); -- if (len + 10 < buflen) { -- sprintf(buf + len, ":%d", _lineno); -- } -- st->print(" (%s)", buf); -+ st->print(" (%s:%d)", file, _lineno); - } else { - st->print(" (0x%x)", _id); - } --- -2.18.0 - 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..fc8fca5 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch @@ -0,0 +1,39 @@ +From 03052435dc7f1146ddd7ebe6f510a89448d33aca Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 22 Oct 2020 09:24:50 +0200 +Subject: [PATCH 12/13] autoconf: NativeCompilation: remove sysroot + +Upstream-Status: Pending + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + make/common/NativeCompilation.gmk | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk +index b4ea2c6..01082f5 100644 +--- a/make/common/NativeCompilation.gmk ++++ b/make/common/NativeCompilation.gmk +@@ -383,10 +383,6 @@ define SetupNativeCompilation + $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION)) + endif + +- # Add sys root specific cflags last +- $1_EXTRA_CFLAGS += $(SYSROOT_CFLAGS) +- $1_EXTRA_CXXFLAGS += $(SYSROOT_CFLAGS) +- + # Now call add_native_source for each source file we are going to compile. + $$(foreach p,$$($1_SRCS), \ + $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ +@@ -432,8 +428,6 @@ define SetupNativeCompilation + $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE)) + endif + +- $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS) +- + $1 := $$($1_TARGET) + ifneq (,$$($1_LIBRARY)) + # Generating a dynamic library. +-- +2.26.2 + 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 @@ -From 1fa1097d45afa2fe2bfd989fbd90578f5c5fc540 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Mon, 13 Aug 2018 12:14:21 +0100 -Subject: [PATCH] hotspot/aarch64: fix undefined behaviour (gcc v8 fix) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Backport patch from - http://hg.openjdk.java.net/aarch64-port/jdk8u/hotspot/rev/253b0c304db6 -to address segfaults due to undefined behaviour. - -|# HG changeset patch -|# User shade -|# Date 1526068247 -7200 -|# Node ID 253b0c304db6d31be3d3d7cf7cf1b3561a16dc3a -|# Parent 1ced2ae00e35e6f855175fc44500b37fbac9e314 -UB in os_linux_aarch64.cpp SpinPause -Reviewed-by: aph, shade, adinn - -Signed-off-by: André Draszik <andre.draszik@jci.com> -Upstream-Status: Backport [http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916] ---- - hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 1 + - 1 file changed, 1 insertion(+) - -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 -index 8b985693..f536817e 100644 ---- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp -+++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp -@@ -699,6 +699,7 @@ void os::verify_stack_alignment() { - - extern "C" { - int SpinPause() { -+ return 0; - } - - void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) { --- -2.18.0 - diff --git a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch new file mode 100644 index 0000000..7991a04 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch @@ -0,0 +1,219 @@ +From 3a41aceff84ac9c64910f2efbd4bee7c3532c65d Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Wed, 29 Apr 2020 10:15:11 +0200 +Subject: [PATCH] autoconf: remove Werror + +We don't want to mess around with disabling warnings on new +compiler versions therefore we remove Werror. + +Upstream-Status: Invalid + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + common/autoconf/flags.m4 | 12 +++--- + common/autoconf/generated-configure.sh | 56 +++++++++++++------------- + 2 files changed, 34 insertions(+), 34 deletions(-) + +diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 +index 077efa29..b98575a1 100644 +--- a/common/autoconf/flags.m4 ++++ b/common/autoconf/flags.m4 +@@ -399,7 +399,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" + fi + $2CXXSTD_CXXFLAG="-std=gnu++98" +- FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror], ++ FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG], + [], [$2CXXSTD_CXXFLAG=""]) + $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}" + $2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}" +@@ -489,17 +489,17 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], + # Notably, -ffp-contract=off needs to be added for GCC >= 4.6, + # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 + COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" +- FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]COMPILER_FP_CONTRACT_OFF_FLAG -Werror], ++ FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]COMPILER_FP_CONTRACT_OFF_FLAG], + [], [COMPILER_FP_CONTRACT_OFF_FLAG=""]) + if test "x$COMPILER_FP_CONTRACT_OFF_FLAG" = x; then + if test "$OPENJDK_TARGET_CPU_ARCH" = "x86" || + test "$OPENJDK_TARGET_CPU_ARCH" = "x86_64" || + test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then + M_NO_FUSED_ADD_FLAG="-mno-fused-madd" +- FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]M_NO_FUSED_ADD_FLAG -Werror], ++ FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]M_NO_FUSED_ADD_FLAG], + [], [M_NO_FUSED_ADD_FLAG=""]) + NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" +- FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]NO_STRICT_ALIASING_FLAG -Werror], ++ FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]NO_STRICT_ALIASING_FLAG], + [], [NO_STRICT_ALIASING_FLAG=""]) + if test "x$M_NO_FUSED_ADD_FLAG" != "x" && test "x$NO_STRICT_ALIASING_FLAG" != "x"; then + FDLIBM_CFLAGS="$M_NO_FUSED_ADD_FLAG $NO_STRICT_ALIASING_FLAG" +@@ -866,11 +866,11 @@ AC_DEFUN_ONCE([FLAGS_SETUP_GCC6_COMPILER_FLAGS], + # Notably, value range propagation now assumes that the this pointer of C++ + # member functions is non-null. + NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" +- FLAGS_COMPILER_CHECK_ARGUMENTS([$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror], ++ FLAGS_COMPILER_CHECK_ARGUMENTS([$NO_DELETE_NULL_POINTER_CHECKS_CFLAG], + [], [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""]) + AC_SUBST([NO_DELETE_NULL_POINTER_CHECKS_CFLAG]) + NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" +- FLAGS_COMPILER_CHECK_ARGUMENTS([$NO_LIFETIME_DSE_CFLAG -Werror], ++ FLAGS_COMPILER_CHECK_ARGUMENTS([$NO_LIFETIME_DSE_CFLAG], + [], [NO_LIFETIME_DSE_CFLAG=""]) + CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" + AC_SUBST([NO_LIFETIME_DSE_CFLAG]) +diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh +index d57035b0..1953dc4e 100644 +--- a/common/autoconf/generated-configure.sh ++++ b/common/autoconf/generated-configure.sh +@@ -41498,12 +41498,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } + fi + CXXSTD_CXXFLAG="-std=gnu++98" + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"" >&5 +-$as_echo_n "checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG\"" >&5 ++$as_echo_n "checking if the C++ compiler supports \"$CXXSTD_CXXFLAG\"... " >&6; } + supports=yes + + saved_cxxflags="$CXXFLAGS" +- CXXFLAGS="$CXXFLAG $CXXSTD_CXXFLAG -Werror" ++ CXXFLAGS="$CXXFLAG $CXXSTD_CXXFLAG" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -41654,12 +41654,12 @@ fi + NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"" >&5 +-$as_echo_n "checking if the C compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG\"" >&5 ++$as_echo_n "checking if the C compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG\"... " >&6; } + supports=yes + + saved_cflags="$CFLAGS" +- CFLAGS="$CFLAGS $NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror" ++ CFLAGS="$CFLAGS $NO_DELETE_NULL_POINTER_CHECKS_CFLAG" + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -41694,12 +41694,12 @@ $as_echo "$supports" >&6; } + fi + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"" >&5 +-$as_echo_n "checking if the C++ compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG\"" >&5 ++$as_echo_n "checking if the C++ compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG\"... " >&6; } + supports=yes + + saved_cxxflags="$CXXFLAGS" +- CXXFLAGS="$CXXFLAG $NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror" ++ CXXFLAGS="$CXXFLAG $NO_DELETE_NULL_POINTER_CHECKS_CFLAG" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -41733,8 +41733,8 @@ $as_echo "$supports" >&6; } + fi + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"" >&5 +-$as_echo_n "checking if both compilers support \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG\"" >&5 ++$as_echo_n "checking if both compilers support \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG\"... " >&6; } + supports=no + if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi + +@@ -41750,12 +41750,12 @@ $as_echo "$supports" >&6; } + NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5 +-$as_echo_n "checking if the C compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$NO_LIFETIME_DSE_CFLAG\"" >&5 ++$as_echo_n "checking if the C compiler supports \"$NO_LIFETIME_DSE_CFLAG\"... " >&6; } + supports=yes + + saved_cflags="$CFLAGS" +- CFLAGS="$CFLAGS $NO_LIFETIME_DSE_CFLAG -Werror" ++ CFLAGS="$CFLAGS $NO_LIFETIME_DSE_CFLAG" + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -41789,12 +41789,12 @@ $as_echo "$supports" >&6; } + fi + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5 +-$as_echo_n "checking if the C++ compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_LIFETIME_DSE_CFLAG\"" >&5 ++$as_echo_n "checking if the C++ compiler supports \"$NO_LIFETIME_DSE_CFLAG\"... " >&6; } + supports=yes + + saved_cxxflags="$CXXFLAGS" +- CXXFLAGS="$CXXFLAG $NO_LIFETIME_DSE_CFLAG -Werror" ++ CXXFLAGS="$CXXFLAG $NO_LIFETIME_DSE_CFLAG" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -41828,8 +41828,8 @@ $as_echo "$supports" >&6; } + fi + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5 +-$as_echo_n "checking if both compilers support \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$NO_LIFETIME_DSE_CFLAG\"" >&5 ++$as_echo_n "checking if both compilers support \"$NO_LIFETIME_DSE_CFLAG\"... " >&6; } + supports=no + if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi + +@@ -41862,12 +41862,12 @@ $as_echo "$supports" >&6; } + # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 + COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$COMPILER_FP_CONTRACT_OFF_FLAG -Werror\"" >&5 +-$as_echo_n "checking if the C++ compiler supports \"$COMPILER_FP_CONTRACT_OFF_FLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$COMPILER_FP_CONTRACT_OFF_FLAG\"" >&5 ++$as_echo_n "checking if the C++ compiler supports \"$COMPILER_FP_CONTRACT_OFF_FLAG\"... " >&6; } + supports=yes + + saved_cxxflags="$CXXFLAGS" +- CXXFLAGS="$CXXFLAG $COMPILER_FP_CONTRACT_OFF_FLAG -Werror" ++ CXXFLAGS="$CXXFLAG $COMPILER_FP_CONTRACT_OFF_FLAG" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -41906,12 +41906,12 @@ $as_echo "$supports" >&6; } + test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then + M_NO_FUSED_ADD_FLAG="-mno-fused-madd" + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$M_NO_FUSED_ADD_FLAG -Werror\"" >&5 +-$as_echo_n "checking if the C++ compiler supports \"$M_NO_FUSED_ADD_FLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$M_NO_FUSED_ADD_FLAG\"" >&5 ++$as_echo_n "checking if the C++ compiler supports \"$M_NO_FUSED_ADD_FLAG\"... " >&6; } + supports=yes + + saved_cxxflags="$CXXFLAGS" +- CXXFLAGS="$CXXFLAG $M_NO_FUSED_ADD_FLAG -Werror" ++ CXXFLAGS="$CXXFLAG $M_NO_FUSED_ADD_FLAG" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -41946,12 +41946,12 @@ $as_echo "$supports" >&6; } + + NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_STRICT_ALIASING_FLAG -Werror\"" >&5 +-$as_echo_n "checking if the C++ compiler supports \"$NO_STRICT_ALIASING_FLAG -Werror\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_STRICT_ALIASING_FLAG\"" >&5 ++$as_echo_n "checking if the C++ compiler supports \"$NO_STRICT_ALIASING_FLAG\"... " >&6; } + supports=yes + + saved_cxxflags="$CXXFLAGS" +- CXXFLAGS="$CXXFLAG $NO_STRICT_ALIASING_FLAG -Werror" ++ CXXFLAGS="$CXXFLAG $NO_STRICT_ALIASING_FLAG" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 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 @@ -From 3bd88f93a90876f8ead05de40816da0bd1e39aac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Mon, 13 Aug 2018 11:49:26 +0100 -Subject: [PATCH] hotspot/zero: fix undefined behaviour (gcc v8 fix) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Backport patch from - https://bugs.openjdk.java.net/browse/JDK-8202600 - http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 -to address segfaults due to undefined behaviour. - -|# HG changeset patch -|# User sgehwolf -|# Date 1525366788 -7200 -|# Node ID ca4663e589160509d6aef8ec890815e1330b97bc -|# Parent a27880c1288ba776f65748b68c198df97427f950 -8202600: [Zero] Undefined behaviour in src/os_cpu/linux_zero/vm/os_linux_zero.cpp -Reviewed-by: stuefe, shade, dholmes - -Signed-off-by: André Draszik <andre.draszik@jci.com> -Upstream-Status: Backport [http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916] ---- - hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + - 1 file changed, 1 insertion(+) - -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 -index 1d069c6d..8dcf9d44 100644 ---- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -@@ -408,6 +408,7 @@ void os::print_register_info(outputStream *st, void *context) { - - extern "C" { - int SpinPause() { -+ return 0; // Shouldn't matter. - } - - --- -2.18.0 - 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 @@ -From dbf31e2dfd00e20ab49af70f3533a348e8a6515e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Mon, 13 Aug 2018 16:47:25 +0100 -Subject: [PATCH 4/5] hotspot: Fix debug build after 8062808: Turn on the - -Wreturn-type warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -|# HG changeset patch -|# User goetz -|# Date 1415873641 -3600 -|# Thu Nov 13 11:14:01 2014 +0100 -|# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906 -|# Parent 533473c67de6ff767710594639033c8e83523fe5 -8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning -Reviewed-by: stefank, tschatzl - -Signed-off-by: André Draszik <andre.draszik@jci.com> -Upstream-Status: Backport ---- - hotspot/src/share/vm/prims/jni.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp -index 6a6ab936..e2f2ad3b 100644 ---- a/hotspot/src/share/vm/prims/jni.cpp -+++ b/hotspot/src/share/vm/prims/jni.cpp -@@ -708,6 +708,7 @@ JNI_ENTRY(jint, jni_Throw(JNIEnv *env, jthrowable obj)) - - THROW_OOP_(JNIHandles::resolve(obj), JNI_OK); - ShouldNotReachHere(); -+ return 0; // Mute compiler. - JNI_END - - #ifndef USDT2 -@@ -734,6 +735,7 @@ JNI_ENTRY(jint, jni_ThrowNew(JNIEnv *env, jclass clazz, const char *message)) - Handle protection_domain (THREAD, k->protection_domain()); - THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK); - ShouldNotReachHere(); -+ return 0; // Mute compiler. - JNI_END - - --- -2.18.0 - 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 @@ -From 90220d41f65910b108c901977eefe78fc1edecc5 Mon Sep 17 00:00:00 2001 -From: Nicola Lunghi <nicola.lunghi@jci.com> -Date: Mon, 17 Jun 2019 13:59:26 +0100 -Subject: [PATCH] Enable HotSpot builds on 5.x Linux kernels - -8217753: Enable HotSpot builds on 5.x Linux kernels -Summary: Remove Linux kernel version check as very unlikely a kernel older than 2.4 will be used. -Reviewed-by: erikj - -Upstream-Status: Backport (http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c) ---- - hotspot/make/linux/Makefile | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/hotspot/make/linux/Makefile b/hotspot/make/linux/Makefile -index 17c14097..e8f20104 100644 ---- a/hotspot/make/linux/Makefile -+++ b/hotspot/make/linux/Makefile -@@ -227,20 +227,7 @@ all: - @echo " $(TARGETS_SHARK)" - @echo " $(TARGETS_MINIMAL1)" - --checks: check_os_version check_j2se_version -- --# We do not want people accidentally building on old systems (e.g. Linux 2.2.x, --# Solaris 2.5.1, 2.6). --# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. -- --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% --OS_VERSION := $(shell uname -r) --EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) -- --check_os_version: --ifeq ($(DISABLE_HOTSPOT_OS_VERSION_CHECK)$(EMPTY_IF_NOT_SUPPORTED),) -- $(QUIETLY) >&2 echo "*** This OS is not supported:" `uname -a`; exit 1; --endif -+checks: check_j2se_version - - # jvmti.make requires XSLT (J2SE 1.4.x or newer): - XSLT_CHECK = $(REMOTE) $(RUN.JAVAP) javax.xml.transform.TransformerFactory --- -2.20.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch new file mode 100644 index 0000000..b2e50e0 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch @@ -0,0 +1,37 @@ +From 4d1bd6a65c52564f32761217ded7b9bdde43556b Mon Sep 17 00:00:00 2001 +From: Wenlin Kang <wenlin.kang@windriver.com> +Date: Sun, 17 Feb 2019 22:38:33 -0800 +Subject: [PATCH 1001/1013] hotspot: fix crash on JNI_CreateJavaVM + +In function os::pd_create_stack_guard_pages(char* addr, size_t size), +when addr < os::Linux::initial_thread_stack_bottom(), usually munmap() +will not be called, but when mincore()==-1, get_stack_commited_bottom() +will make stack_extent < os::Linux::initial_thread_stack_bottom() and +stack_extent < addr too, then munmap() is called, in such case, it may +cause segment(we have reproduced it on linux_PPC). + +Upstream-Status: Pending + +Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + src/os/linux/vm/os_linux.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp +index c477851c1..47eef1e7c 100644 +--- a/hotspot/src/os/linux/vm/os_linux.cpp ++++ b/hotspot/src/os/linux/vm/os_linux.cpp +@@ -3227,7 +3227,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) { + uintptr_t stack_extent = (uintptr_t) os::Linux::initial_thread_stack_bottom(); + unsigned char vec[1]; + +- if (mincore((address)stack_extent, os::vm_page_size(), vec) == -1) { ++ if ((mincore((address)stack_extent, os::vm_page_size(), vec) == -1) ++ && ((size_t)addr > (size_t)stack_extent)) { + // Fallback to slow path on all errors, including EAGAIN + stack_extent = (uintptr_t) get_stack_commited_bottom( + os::Linux::initial_thread_stack_bottom(), +-- +2.26.2 + 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..7739c8b 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 @@ -From 79e35bd203b40979e1d241a04d6d9df373327bef Mon Sep 17 00:00:00 2001 +From 9f2a5acce1da9908a7e94388880c831e1635e51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 09:28:06 +0000 -Subject: [PATCH 5/9] hotspot: use correct include for poll +Subject: [PATCH] hotspot: use correct include for poll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -20,7 +20,10 @@ the following command: done Upstream-Status: Pending + Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- @@ -29,7 +32,7 @@ Signed-off-by: André Draszik <andre.draszik@jci.com> 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp -index a97c94c0..e2974ee1 100644 +index 421ea342..9a1e1e09 100644 --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp @@ -34,7 +34,7 @@ @@ -42,7 +45,7 @@ index a97c94c0..e2974ee1 100644 #include <netdb.h> diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp -index 10b39941..3144a29c 100644 +index c35abf48..8ff584ae 100644 --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp @@ -33,7 +33,7 @@ @@ -55,7 +58,7 @@ index 10b39941..3144a29c 100644 inline void* os::thread_local_storage_at(int index) { diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp -index 10d56d89..b9b2b775 100644 +index a23bd563..9d56de0e 100644 --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp @@ -33,7 +33,7 @@ @@ -68,7 +71,7 @@ index 10d56d89..b9b2b775 100644 inline void* os::thread_local_storage_at(int index) { diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp -index 921fcf7c..5d80a7d0 100644 +index 8e095ab6..ce37e9a1 100644 --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp @@ -33,7 +33,7 @@ @@ -80,6 +83,3 @@ index 921fcf7c..5d80a7d0 100644 #include <sys/filio.h> #include <unistd.h> #include <netdb.h> --- -2.16.2 - 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..e0864be 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 @@ -From 4ed4b58270dcd3d897adef605893c104944c4f3a Mon Sep 17 00:00:00 2001 +From 7e40a364af1427b5f5238cd8d49e947db1c1557d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 15:00:55 +0000 -Subject: [PATCH 6/9] hotspot: don't rely on old SysV SIGCLD +Subject: [PATCH] hotspot: don't rely on old SysV SIGCLD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -17,7 +17,10 @@ leads to the following compilation error: Just make it conditional, so the code compiles everywhere. Upstream-Status: Pending + Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- hotspot/src/os/linux/vm/jvm_linux.cpp | 2 ++ 1 file changed, 2 insertions(+) @@ -36,6 +39,3 @@ index ba84788a..c22281f7 100644 "CHLD", SIGCHLD, /* Child status has changed (POSIX). */ "CONT", SIGCONT, /* Continue (POSIX). */ "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ --- -2.16.2 - 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/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch index fb7bb59..2eba669 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/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch @@ -1,7 +1,7 @@ -From f6424c46b4af08d0662eec1a5897d5502270a3b1 Mon Sep 17 00:00:00 2001 +From 7cca9e147d9f4b98ffbc6b10e817d2e8dbd686fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 13 Aug 2018 16:40:34 +0100 -Subject: [PATCH 1/5] hotspot: fix -Wreturn-type issues introduced by 8061651 +Subject: [PATCH] hotspot: fix -Wreturn-type issues introduced by 8061651 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,17 +14,20 @@ Content-Transfer-Encoding: 8bit |# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de PR3601: Fix additional -Wreturn-type issues introduced by 8061651 -Signed-off-by: André Draszik <andre.draszik@jci.com> Upstream-Status: Backport + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- hotspot/src/share/vm/prims/jvm.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp -index 07c36de8..067fd3ac 100644 +index c32c98ad..6f2221c4 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp +++ b/hotspot/src/share/vm/prims/jvm.cpp -@@ -835,7 +835,7 @@ JVM_END +@@ -929,7 +929,7 @@ JVM_END JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname)) JVMWrapper("JVM_KnownToNotExist"); #if INCLUDE_CDS @@ -33,7 +36,7 @@ index 07c36de8..067fd3ac 100644 #else return false; #endif -@@ -845,7 +845,7 @@ JVM_END +@@ -939,7 +939,7 @@ JVM_END JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)) JVMWrapper("JVM_GetResourceLookupCacheURLs"); #if INCLUDE_CDS @@ -42,7 +45,7 @@ index 07c36de8..067fd3ac 100644 #else return NULL; #endif -@@ -855,7 +855,7 @@ JVM_END +@@ -949,7 +949,7 @@ JVM_END JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name)) JVMWrapper("JVM_GetResourceLookupCache"); #if INCLUDE_CDS @@ -51,6 +54,3 @@ index 07c36de8..067fd3ac 100644 #else return NULL; #endif --- -2.18.0 - diff --git a/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch index d6bedbc..36eefe5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch @@ -1,7 +1,7 @@ -From 43c1f744e5f6171df3158baf88dd0a64c4b5e439 Mon Sep 17 00:00:00 2001 +From 9ae232a21a7c2cec88cdb4ff7e6cf7092f1578ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 13 Aug 2018 16:45:24 +0100 -Subject: [PATCH 2/5] hotspot: Zero build requires disabled warnings +Subject: [PATCH] hotspot: Zero build requires disabled warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,17 +15,20 @@ Content-Transfer-Encoding: 8bit 8143245, PR3548: Zero build requires disabled warnings Reviewed-by: dholmes, coleenp -Signed-off-by: André Draszik <andre.draszik@jci.com> Upstream-Status: Backport + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- - hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- - .../src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 16 +++++++++++++--- - .../os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- - 4 files changed, 18 insertions(+), 7 deletions(-) + hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- + hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- + hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++-- + .../src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- + 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp -index 242ce1cf..065471af 100644 +index 525031eb..d47422b8 100644 --- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp +++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp @@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { @@ -58,17 +61,9 @@ index e23e3eaa..061ed8ce 100644 case T_VOID: ftype = &ffi_type_void; 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 -index 8dcf9d44..508eb172 100644 +index d22ea114..cbee43ba 100644 --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -@@ -1,6 +1,6 @@ - /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. -- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. -+ * Copyright 2016 Red Hat, Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -61,6 +61,7 @@ address os::current_stack_pointer() { frame os::get_sender_for_C_frame(frame* fr) { @@ -125,7 +120,7 @@ index 8dcf9d44..508eb172 100644 void os::Linux::set_fpu_control_word(int fpu) { 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 -index 39f77f85..b9c73dc4 100644 +index 94bc83a3..b3ba526f 100644 --- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp +++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp @@ -1,5 +1,5 @@ @@ -142,7 +137,4 @@ index 39f77f85..b9c73dc4 100644 + return false; // silence compile warning } - // These routines are only used on cpu architectures that --- -2.18.0 - + bool pd_get_top_frame_for_profiling(frame* fr_addr, 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/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch index 001e905..2e32702 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/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch @@ -1,7 +1,7 @@ -From 6e1d92639787ac8f506f810776a3f1c35f2cd070 Mon Sep 17 00:00:00 2001 +From 1f618dcda554d85d1c1dcd1bfd84d9554cb2f3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 13 Aug 2018 16:46:33 +0100 -Subject: [PATCH 3/5] hotspot: Missing return statement in +Subject: [PATCH] hotspot: Missing return statement in __sync_val_compare_and_swap_8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -17,8 +17,11 @@ Content-Transfer-Encoding: 8bit Summary: Fix issue discovered by -Wreturn-type on systems without LP64. Reviewed-by: aph -Signed-off-by: André Draszik <andre.draszik@jci.com> Upstream-Status: Backport + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + @@ -37,7 +40,7 @@ index c857b552..4aaf78b1 100644 }; #endif // !_LP64 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 -index 508eb172..bb8fa1f1 100644 +index cbee43ba..136d4d3d 100644 --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -498,6 +498,7 @@ extern "C" { @@ -48,6 +51,3 @@ index 508eb172..bb8fa1f1 100644 } }; #endif // !_LP64 --- -2.18.0 - 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/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch index 0156978..b1b59c3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0019-hotspot-Turn-on-the-Wreturn-type-warning.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch @@ -1,7 +1,11 @@ -From cc0d371f17c0ab060eb1e6b42d4bf053a2cbc3ba Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Mon, 13 Aug 2018 16:48:32 +0100 -Subject: [PATCH 5/5] hotspot: Turn on the -Wreturn-type warning +From 6758bf27e31110dc5d4c7237476c823ff05454a2 Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 22 Oct 2020 09:41:07 +0200 +Subject: [PATCH] hotspot: Turn on the -Wreturn-type warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,8 +19,11 @@ Content-Transfer-Encoding: 8bit 8062808, PR3548: Turn on the -Wreturn-type warning Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett -Signed-off-by: André Draszik <andre.draszik@jci.com> Upstream-Status: Backport + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- hotspot/make/linux/makefiles/gcc.make | 2 +- hotspot/src/cpu/x86/vm/x86_32.ad | 1 + @@ -34,10 +41,10 @@ Upstream-Status: Backport 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make -index 272afcea..157afff2 100644 +index 36b3c8ba..cd9511e5 100644 --- a/hotspot/make/linux/makefiles/gcc.make +++ b/hotspot/make/linux/makefiles/gcc.make -@@ -207,7 +207,7 @@ ifeq ($(USE_CLANG), true) +@@ -211,7 +211,7 @@ ifeq ($(USE_CLANG), true) WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body endif @@ -59,7 +66,7 @@ index f42d1a28..c8f4ee16 100644 #ifndef PRODUCT 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 -index fb96738a..4cdeb372 100644 +index c35d8677..65c3165c 100644 --- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp @@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig, @@ -71,7 +78,7 @@ index fb96738a..4cdeb372 100644 void os::Linux::init_thread_fpu_state(void) { diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp -index 0e3d5d7b..d3df1d15 100644 +index 4b4b4e25..196622ae 100644 --- a/hotspot/src/share/vm/classfile/defaultMethods.cpp +++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp @@ -506,7 +506,7 @@ Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method @@ -93,7 +100,7 @@ index 0e3d5d7b..d3df1d15 100644 diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp -index ec97077b..2621a7d6 100644 +index 83369cbc..8dd4e6b2 100644 --- a/hotspot/src/share/vm/classfile/symbolTable.cpp +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp @@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { @@ -115,10 +122,10 @@ index ec97077b..2621a7d6 100644 Symbol* SymbolTable::lookup_only(const char* name, int len, diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp -index 8d2e7f49..62bdba3e 100644 +index 4541e815..98412e1e 100644 --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp -@@ -229,15 +229,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader +@@ -236,15 +236,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader class_name->as_C_string(), class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string())); if (FieldType::is_array(class_name)) { @@ -164,10 +171,10 @@ index 2f3abae6..d58ebecb 100644 static ReservedSpace* shared_rs() { CDS_ONLY(return _shared_rs); diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp -index f170decc..a1e168b2 100644 +index 68435471..fad4a92c 100644 --- a/hotspot/src/share/vm/oops/constantPool.hpp +++ b/hotspot/src/share/vm/oops/constantPool.hpp -@@ -349,7 +349,7 @@ class ConstantPool : public Metadata { +@@ -350,7 +350,7 @@ class ConstantPool : public Metadata { Klass* klass_at(int which, TRAPS) { constantPoolHandle h_this(THREAD, this); @@ -175,12 +182,12 @@ index f170decc..a1e168b2 100644 + return klass_at_impl(h_this, which, THREAD); } - Symbol* klass_name_at(int which); // Returns the name, w/o resolving. + Symbol* klass_name_at(int which) const; // Returns the name, w/o resolving. diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp -index 067fd3ac..b9e5b322 100644 +index 6f2221c4..daa69f89 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp +++ b/hotspot/src/share/vm/prims/jvm.cpp -@@ -4280,7 +4280,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( +@@ -4368,7 +4368,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( JVM_DTraceProvider* providers)) JVMWrapper("JVM_DTraceActivate"); return DTraceJSDT::activate( @@ -190,7 +197,7 @@ index 067fd3ac..b9e5b322 100644 JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method)) diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp -index e2f282ee..679e1775 100644 +index 4b39d8cc..9cd7b0dc 100644 --- a/hotspot/src/share/vm/runtime/reflection.cpp +++ b/hotspot/src/share/vm/runtime/reflection.cpp @@ -1093,7 +1093,7 @@ oop Reflection::invoke(instanceKlassHandle klass, methodHandle reflected_method, @@ -203,10 +210,10 @@ index e2f282ee..679e1775 100644 } diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp -index 8ffa8ab3..219bcd5c 100644 +index d5bea29c..50578ad6 100644 --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp -@@ -1038,7 +1038,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, +@@ -1041,7 +1041,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, // last java frame on stack (which includes native call frames) vframeStream vfst(thread, true); // Do not skip and javaCalls @@ -216,7 +223,7 @@ index 8ffa8ab3..219bcd5c 100644 diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp -index 38a027ea..13436a4b 100644 +index 8ea859dd..535147f8 100644 --- a/hotspot/src/share/vm/services/memTracker.hpp +++ b/hotspot/src/share/vm/services/memTracker.hpp @@ -64,7 +64,7 @@ class MemTracker : AllStatic { @@ -228,6 +235,3 @@ index 38a027ea..13436a4b 100644 static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { } static inline void record_thread_stack(void* addr, size_t size) { } static inline void release_thread_stack(void* addr, size_t size) { } --- -2.18.0 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch new file mode 100644 index 0000000..e077c53 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch @@ -0,0 +1,32 @@ +From bb394ba055197ef7c7e27b436dd92f5a86305019 Mon Sep 17 00:00:00 2001 +From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> +Date: Fri, 21 Sep 2018 10:44:06 +0200 +Subject: [PATCH] hotspot: handle format error for GCC >= 7 + +Upstream-Status: Pending + +Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + hotspot/src/share/vm/adlc/output_c.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp +index 19916904..889b785c 100644 +--- a/hotspot/src/share/vm/adlc/output_c.cpp ++++ b/hotspot/src/share/vm/adlc/output_c.cpp +@@ -419,9 +419,11 @@ static int pipeline_res_mask_initializer( + for (i = maxcycleused; i > 0; i /= 10) + cycledigit++; + +- int maskdigit = 0; +- for (i = rescount; i > 0; i /= 10) ++ int maskdigit = 1; ++ for (i = rescount / 10; i > 0; i /= 10) + maskdigit++; ++ if (maskdigit > 10) ++ maskdigit = 10; + + static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; + static const char* pipeline_use_element = "Pipeline_Use_Element"; diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch index fa26d04..a68e3a0 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch @@ -1,22 +1,30 @@ +From 486b1c46d80de99e0820cc6305477ab40ba4e13c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> +Date: Thu, 2 Jan 2020 10:19:29 +0100 +Subject: [PATCH 1009/1013] hotspot: fix adlc flags +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + adlc is built using the native toolchain, not the crosscompiler. It however was incorrectly using flags meant for the crosscompiler. -Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> - Upstream-Status: Inappropriate [Yocto-specific fixes] +Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/make/linux/makefiles/adlc.make | 10 ++++++++++ + make/linux/makefiles/adlc.make | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git hotspot/make/linux/makefiles/adlc.make hotspot/make/linux/makefiles/adlc.make -index 8a86691..2789c03 100644 ---- hotspot/make/linux/makefiles/adlc.make -+++ hotspot/make/linux/makefiles/adlc.make +diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make +index 92b8b9b39..ae0aa0082 100644 +--- a/hotspot/make/linux/makefiles/adlc.make ++++ b/hotspot/make/linux/makefiles/adlc.make @@ -28,6 +28,16 @@ - + include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make - + +# Yocto specific fix - remove target machine flags and replace them with +# build machine flags, as this part is built using the native toolchain +CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS)) @@ -28,7 +36,8 @@ index 8a86691..2789c03 100644 + + # ######################################################################### - + # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: --- -1.9.1 +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch index ece7f14..711d17b 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch @@ -1,6 +1,31 @@ ---- hotspot/make/Makefile.orig -+++ hotspot/make/Makefile -@@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD +From 3028795037c3440415f3e8904e8015fbd480ab15 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 10:22:19 +0100 +Subject: [PATCH 1010/1013] hotspot: fix shark build (common) + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + make/Makefile | 2 +- + src/cpu/zero/vm/interpreter_zero.cpp | 2 +- + src/share/vm/ci/ciTypeFlow.cpp | 4 ++ + src/share/vm/classfile/systemDictionary.cpp | 4 ++ + src/share/vm/runtime/handles.inline.hpp | 8 +++- + src/share/vm/shark/llvmHeaders.hpp | 4 ++ + src/share/vm/shark/sharkCompiler.cpp | 39 ++++++++++++++++--- + src/share/vm/shark/sharkCompiler.hpp | 2 + + src/share/vm/shark/sharkContext.cpp | 9 ++++- + src/share/vm/shark/sharkContext.hpp | 43 ++++++++++++++++++++- + src/share/vm/shark/sharkEntry.hpp | 1 + + src/share/vm/shark/sharkIntrinsics.cpp | 4 ++ + src/share/vm/shark/sharkRuntime.cpp | 1 + + src/share/vm/shark/sharkTopLevelBlock.cpp | 12 ++++++ + 14 files changed, 123 insertions(+), 12 deletions(-) + +diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile +index de2607c71..3054c3fe8 100644 +--- a/hotspot/make/Makefile ++++ b/hotspot/make/Makefile +@@ -536,7 +536,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/% # Unix $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX) $(install-file) @@ -9,8 +34,23 @@ $(install-file) $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz $(install-file) ---- hotspot/src/share/vm/ci/ciTypeFlow.cpp.orig -+++ hotspot/src/share/vm/ci/ciTypeFlow.cpp +diff --git a/hotspot/src/cpu/zero/vm/interpreter_zero.cpp b/hotspot/src/cpu/zero/vm/interpreter_zero.cpp +index 7172443db..5a4b4ad56 100644 +--- a/hotspot/src/cpu/zero/vm/interpreter_zero.cpp ++++ b/hotspot/src/cpu/zero/vm/interpreter_zero.cpp +@@ -49,7 +49,7 @@ + #ifdef COMPILER1 + #include "c1/c1_Runtime1.hpp" + #endif +-#ifdef CC_INTERP ++#if defined(CC_INTERP) || defined(SHARK) + #include "interpreter/cppInterpreter.hpp" + #endif + +diff --git a/hotspot/src/share/vm/ci/ciTypeFlow.cpp b/hotspot/src/share/vm/ci/ciTypeFlow.cpp +index 4707cc96e..a2b297ca0 100644 +--- a/hotspot/src/share/vm/ci/ciTypeFlow.cpp ++++ b/hotspot/src/share/vm/ci/ciTypeFlow.cpp @@ -35,8 +35,10 @@ #include "interpreter/bytecode.hpp" #include "interpreter/bytecodes.hpp" @@ -22,7 +62,7 @@ #include "runtime/deoptimization.hpp" #include "utilities/growableArray.hpp" -@@ -2648,6 +2650,7 @@ void ciTypeFlow::df_flow_types(Block* st +@@ -2648,6 +2650,7 @@ void ciTypeFlow::df_flow_types(Block* start, assert (!blk->has_pre_order(), ""); blk->set_next_pre_order(); @@ -30,7 +70,7 @@ if (_next_pre_order >= (int)Compile::current()->max_node_limit() / 2) { // Too many basic blocks. Bail out. // This can happen when try/finally constructs are nested to depth N, -@@ -2657,6 +2660,7 @@ void ciTypeFlow::df_flow_types(Block* st +@@ -2657,6 +2660,7 @@ void ciTypeFlow::df_flow_types(Block* start, record_failure("too many basic blocks"); return; } @@ -38,9 +78,11 @@ if (do_flow) { flow_block(blk, temp_vector, temp_set); if (failing()) return; // Watch for bailouts. ---- hotspot/src/share/vm/classfile/systemDictionary.cpp.orig -+++ hotspot/src/share/vm/classfile/systemDictionary.cpp -@@ -2289,6 +2289,7 @@ methodHandle SystemDictionary::find_meth +diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp +index df4d56f6f..b1dd335cb 100644 +--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp ++++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp +@@ -2371,6 +2371,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid spe = NULL; // Must create lots of stuff here, but outside of the SystemDictionary lock. m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); @@ -48,7 +90,7 @@ if (!Arguments::is_interpreter_only()) { // Generate a compiled form of the MH intrinsic. AdapterHandlerLibrary::create_native_wrapper(m); -@@ -2298,6 +2299,7 @@ methodHandle SystemDictionary::find_meth +@@ -2380,6 +2381,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid "out of space in CodeCache for method handle intrinsic", empty); } } @@ -56,7 +98,7 @@ // Now grab the lock. We might have to throw away the new method, // if a racing thread has managed to install one at the same time. { -@@ -2311,9 +2313,11 @@ methodHandle SystemDictionary::find_meth +@@ -2393,9 +2395,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid } assert(spe != NULL && spe->method() != NULL, ""); @@ -68,9 +110,11 @@ return spe->method(); } ---- hotspot/src/share/vm/runtime/handles.inline.hpp.orig -+++ hotspot/src/share/vm/runtime/handles.inline.hpp -@@ -51,6 +51,12 @@ inline Handle::Handle(Thread* thread, oo +diff --git a/hotspot/src/share/vm/runtime/handles.inline.hpp b/hotspot/src/share/vm/runtime/handles.inline.hpp +index 761596a50..ca950c154 100644 +--- a/hotspot/src/share/vm/runtime/handles.inline.hpp ++++ b/hotspot/src/share/vm/runtime/handles.inline.hpp +@@ -51,6 +51,12 @@ inline Handle::Handle(Thread* thread, oop obj) { } #endif // ASSERT @@ -83,7 +127,7 @@ // Constructors for metadata handles #define DEF_METADATA_HANDLE_FN(name, type) \ inline name##Handle::name##Handle(type* obj) : _value(obj), _thread(NULL) { \ -@@ -79,7 +85,7 @@ inline name##Handle::name##Handle(const +@@ -79,7 +85,7 @@ inline name##Handle::name##Handle(const name##Handle &h) { \ } else { \ _thread = Thread::current(); \ } \ @@ -92,18 +136,10 @@ _thread->metadata_handles()->push((Metadata*)_value); \ } else { \ _thread = NULL; \ ---- hotspot/src/share/vm/shark/sharkEntry.hpp.orig -+++ hotspot/src/share/vm/shark/sharkEntry.hpp -@@ -27,6 +27,7 @@ - #define SHARE_VM_SHARK_SHARKENTRY_HPP - - #include "shark/llvmHeaders.hpp" -+#include "entry_zero.hpp" - - class SharkContext; - ---- hotspot/src/share/vm/shark/llvmHeaders.hpp.orig -+++ hotspot/src/share/vm/shark/llvmHeaders.hpp +diff --git a/hotspot/src/share/vm/shark/llvmHeaders.hpp b/hotspot/src/share/vm/shark/llvmHeaders.hpp +index 05ef7fea1..4d40ae3dd 100644 +--- a/hotspot/src/share/vm/shark/llvmHeaders.hpp ++++ b/hotspot/src/share/vm/shark/llvmHeaders.hpp @@ -35,7 +35,11 @@ #undef DEBUG #endif @@ -116,114 +152,10 @@ #include <llvm/ExecutionEngine/ExecutionEngine.h> // includes specific to each version ---- common/autoconf/libraries.m4.orig -+++ common/autoconf/libraries.m4 -@@ -834,8 +834,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIB - fi - fi - done -- llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//') -+ llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//; s/\..*$//') - LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}" -+ AS_IF([test $llvm_version -ge 34], [LLVM_CFLAGS="${LLVM_CFLAGS} -std=gnu++11"]) - - unset LLVM_LDFLAGS - for flag in $("${LLVM_CONFIG}" --ldflags); do -@@ -848,7 +849,7 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIB - done - - unset LLVM_LIBS -- for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do -+ for flag in $("${LLVM_CONFIG}" --libs --system-libs ${llvm_components}); do - if echo "${flag}" | grep -q '^-l'; then - if test "${LLVM_LIBS}" != ""; then - LLVM_LIBS="${LLVM_LIBS} " ---- hotspot/src/share/vm/shark/sharkIntrinsics.cpp.orig -+++ hotspot/src/share/vm/shark/sharkIntrinsics.cpp -@@ -265,7 +265,11 @@ void SharkIntrinsics::do_Unsafe_compareA - "addr"); - - // Perform the operation -+#if SHARK_LLVM_VERSION <= 34 - Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent); -+#else -+ Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); -+ #endif - // Push the result - state()->push( - SharkValue::create_jint( ---- hotspot/src/share/vm/shark/sharkRuntime.cpp.orig -+++ hotspot/src/share/vm/shark/sharkRuntime.cpp -@@ -32,6 +32,7 @@ - #ifdef TARGET_ARCH_zero - # include "stack_zero.inline.hpp" - #endif -+#include "memory/oopFactory.hpp" - - using namespace llvm; - ---- hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp.orig -+++ hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp -@@ -1732,7 +1732,11 @@ void SharkTopLevelBlock::do_new() { - heap_object = builder()->CreateIntToPtr( - old_top, SharkType::oop_type(), "heap_object"); - -+#if SHARK_LLVM_VERSION <= 34 - Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent); -+#else -+ Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); -+#endif - builder()->CreateCondBr( - builder()->CreateICmpEQ(old_top, check), - initialize, retry); -@@ -1933,7 +1937,11 @@ void SharkTopLevelBlock::acquire_lock(Va - - Value *lock = builder()->CreatePtrToInt( - monitor_header_addr, SharkType::intptr_type()); -+#if SHARK_LLVM_VERSION <= 34 - Value *check = builder()->CreateAtomicCmpXchg(mark_addr, disp, lock, llvm::Acquire); -+#else -+ Value *check = builder()->CreateAtomicCmpXchg(mark_addr, disp, lock, llvm::Acquire, llvm::Acquire); -+#endif - builder()->CreateCondBr( - builder()->CreateICmpEQ(disp, check), - acquired_fast, try_recursive); -@@ -2018,7 +2026,11 @@ void SharkTopLevelBlock::release_lock(in - PointerType::getUnqual(SharkType::intptr_type()), - "mark_addr"); - -+#if SHARK_LLVM_VERSION <= 34 - Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release); -+#else -+ Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release, llvm::Monotonic); -+#endif - builder()->CreateCondBr( - builder()->CreateICmpEQ(lock, check), - released_fast, slow_path); ---- hotspot/src/cpu/zero/vm/interpreter_zero.cpp.orig -+++ hotspot/src/cpu/zero/vm/interpreter_zero.cpp -@@ -49,7 +49,7 @@ - #ifdef COMPILER1 - #include "c1/c1_Runtime1.hpp" - #endif --#ifdef CC_INTERP -+#if defined(CC_INTERP) || defined(SHARK) - #include "interpreter/cppInterpreter.hpp" - #endif - ---- hotspot/src/share/vm/shark/sharkCompiler.hpp.orig -+++ hotspot/src/share/vm/shark/sharkCompiler.hpp -@@ -40,6 +40,8 @@ class SharkCompiler : public AbstractCom - // Creation - SharkCompiler(); - -+ void init_llvm(); -+ - // Name of this compiler - const char *name() { return "shark"; } - ---- hotspot/src/share/vm/shark/sharkCompiler.cpp.orig -+++ hotspot/src/share/vm/shark/sharkCompiler.cpp +diff --git a/hotspot/src/share/vm/shark/sharkCompiler.cpp b/hotspot/src/share/vm/shark/sharkCompiler.cpp +index 86c09932a..462eb98a7 100644 +--- a/hotspot/src/share/vm/shark/sharkCompiler.cpp ++++ b/hotspot/src/share/vm/shark/sharkCompiler.cpp @@ -61,11 +61,25 @@ SharkCompiler::SharkCompiler() : AbstractCompiler() { // Create the lock to protect the memory manager and execution engine @@ -285,7 +217,7 @@ } void SharkCompiler::initialize() { -@@ -165,7 +183,7 @@ void SharkCompiler::compile_method(ciEnv +@@ -165,7 +183,7 @@ void SharkCompiler::compile_method(ciEnv* env, } // Create the recorders @@ -294,7 +226,7 @@ env->set_oop_recorder(new OopRecorder(&arena)); OopMapSet oopmaps; env->set_debug_info(new DebugInformationRecorder(env->oop_recorder())); -@@ -268,7 +286,12 @@ void SharkCompiler::generate_native_code +@@ -268,7 +286,12 @@ void SharkCompiler::generate_native_code(SharkEntry* entry, if (SharkVerifyFunction != NULL) { if (!fnmatch(SharkVerifyFunction, name, 0)) { @@ -307,7 +239,7 @@ } } -@@ -298,7 +321,11 @@ void SharkCompiler::generate_native_code +@@ -298,7 +321,11 @@ void SharkCompiler::generate_native_code(SharkEntry* entry, #endif #endif // !NDEBUG memory_manager()->set_entry_for_function(function, entry); @@ -319,8 +251,23 @@ } assert(code != NULL, "code must be != NULL"); entry->set_entry_point(code); ---- hotspot/src/share/vm/shark/sharkContext.cpp.orig -+++ hotspot/src/share/vm/shark/sharkContext.cpp +diff --git a/hotspot/src/share/vm/shark/sharkCompiler.hpp b/hotspot/src/share/vm/shark/sharkCompiler.hpp +index 974002988..36b5b2427 100644 +--- a/hotspot/src/share/vm/shark/sharkCompiler.hpp ++++ b/hotspot/src/share/vm/shark/sharkCompiler.hpp +@@ -40,6 +40,8 @@ class SharkCompiler : public AbstractCompiler { + // Creation + SharkCompiler(); + ++ void init_llvm(); ++ + // Name of this compiler + const char *name() { return "shark"; } + +diff --git a/hotspot/src/share/vm/shark/sharkContext.cpp b/hotspot/src/share/vm/shark/sharkContext.cpp +index 0fc86f0b1..e16318ccf 100644 +--- a/hotspot/src/share/vm/shark/sharkContext.cpp ++++ b/hotspot/src/share/vm/shark/sharkContext.cpp @@ -34,8 +34,13 @@ using namespace llvm; @@ -337,8 +284,10 @@ // Create a module to build our functions into _module = new Module(name, *this); ---- hotspot/src/share/vm/shark/sharkContext.hpp.orig -+++ hotspot/src/share/vm/shark/sharkContext.hpp +diff --git a/hotspot/src/share/vm/shark/sharkContext.hpp b/hotspot/src/share/vm/shark/sharkContext.hpp +index 952cf13b7..85b48e99a 100644 +--- a/hotspot/src/share/vm/shark/sharkContext.hpp ++++ b/hotspot/src/share/vm/shark/sharkContext.hpp @@ -29,6 +29,8 @@ #include "shark/llvmHeaders.hpp" #include "shark/sharkCompiler.hpp" @@ -348,7 +297,7 @@ // The LLVMContext class allows multiple instances of LLVM to operate // independently of each other in a multithreaded context. We extend // this here to store things in Shark that are LLVMContext-specific. -@@ -41,12 +43,28 @@ class SharkContext : public llvm::LLVMCo +@@ -41,12 +43,28 @@ class SharkContext : public llvm::LLVMContext { private: llvm::Module* _module; @@ -377,7 +326,7 @@ // Get this thread's SharkContext public: static SharkContext& current() { -@@ -55,12 +73,35 @@ class SharkContext : public llvm::LLVMCo +@@ -55,12 +73,35 @@ class SharkContext : public llvm::LLVMContext { // Module accessors public: @@ -414,3 +363,86 @@ } // Basic types +diff --git a/hotspot/src/share/vm/shark/sharkEntry.hpp b/hotspot/src/share/vm/shark/sharkEntry.hpp +index e0f535c69..c079e255a 100644 +--- a/hotspot/src/share/vm/shark/sharkEntry.hpp ++++ b/hotspot/src/share/vm/shark/sharkEntry.hpp +@@ -27,6 +27,7 @@ + #define SHARE_VM_SHARK_SHARKENTRY_HPP + + #include "shark/llvmHeaders.hpp" ++#include "entry_zero.hpp" + + class SharkContext; + +diff --git a/hotspot/src/share/vm/shark/sharkIntrinsics.cpp b/hotspot/src/share/vm/shark/sharkIntrinsics.cpp +index 9ad91c96d..560bb83f4 100644 +--- a/hotspot/src/share/vm/shark/sharkIntrinsics.cpp ++++ b/hotspot/src/share/vm/shark/sharkIntrinsics.cpp +@@ -265,7 +265,11 @@ void SharkIntrinsics::do_Unsafe_compareAndSwapInt() { + "addr"); + + // Perform the operation ++#if SHARK_LLVM_VERSION <= 34 + Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent); ++#else ++ Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); ++ #endif + // Push the result + state()->push( + SharkValue::create_jint( +diff --git a/hotspot/src/share/vm/shark/sharkRuntime.cpp b/hotspot/src/share/vm/shark/sharkRuntime.cpp +index fd9916e11..1ae03753e 100644 +--- a/hotspot/src/share/vm/shark/sharkRuntime.cpp ++++ b/hotspot/src/share/vm/shark/sharkRuntime.cpp +@@ -32,6 +32,7 @@ + #ifdef TARGET_ARCH_zero + # include "stack_zero.inline.hpp" + #endif ++#include "memory/oopFactory.hpp" + + using namespace llvm; + +diff --git a/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp b/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp +index 243183c07..601ca7925 100644 +--- a/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp ++++ b/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp +@@ -1732,7 +1732,11 @@ void SharkTopLevelBlock::do_new() { + heap_object = builder()->CreateIntToPtr( + old_top, SharkType::oop_type(), "heap_object"); + ++#if SHARK_LLVM_VERSION <= 34 + Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent); ++#else ++ Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); ++#endif + builder()->CreateCondBr( + builder()->CreateICmpEQ(old_top, check), + initialize, retry); +@@ -1933,7 +1937,11 @@ void SharkTopLevelBlock::acquire_lock(Value *lockee, int exception_action) { + + Value *lock = builder()->CreatePtrToInt( + monitor_header_addr, SharkType::intptr_type()); ++#if SHARK_LLVM_VERSION <= 34 + Value *check = builder()->CreateAtomicCmpXchg(mark_addr, disp, lock, llvm::Acquire); ++#else ++ Value *check = builder()->CreateAtomicCmpXchg(mark_addr, disp, lock, llvm::Acquire, llvm::Acquire); ++#endif + builder()->CreateCondBr( + builder()->CreateICmpEQ(disp, check), + acquired_fast, try_recursive); +@@ -2018,7 +2026,11 @@ void SharkTopLevelBlock::release_lock(int exception_action) { + PointerType::getUnqual(SharkType::intptr_type()), + "mark_addr"); + ++#if SHARK_LLVM_VERSION <= 34 + Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release); ++#else ++ Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release, llvm::Monotonic); ++#endif + builder()->CreateCondBr( + builder()->CreateICmpEQ(lock, check), + released_fast, slow_path); +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-restrict-to-staging-dir.patch b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-restrict-to-staging-dir.patch new file mode 100644 index 0000000..b5b9471 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-restrict-to-staging-dir.patch @@ -0,0 +1,26 @@ +From 364b8a715b96f069bf455894b0ae290c52d3ab19 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 10:23:38 +0100 +Subject: [PATCH 1011/1013] hotspot: restrict to staging dir + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + make/linux/makefiles/dtrace.make | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hotspot/make/linux/makefiles/dtrace.make b/hotspot/make/linux/makefiles/dtrace.make +index 386e94b1f..7642a67f8 100644 +--- a/hotspot/make/linux/makefiles/dtrace.make ++++ b/hotspot/make/linux/makefiles/dtrace.make +@@ -40,7 +40,7 @@ else + ifneq ($(ALT_SDT_H),) + SDT_H_FILE = $(ALT_SDT_H) + else +- SDT_H_FILE = /usr/include/sys/sdt.h ++ SDT_H_FILE = $(SYS_ROOT)/usr/include/sys/sdt.h + endif + DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) + REASON = "$(SDT_H_FILE) not found" +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch new file mode 100644 index 0000000..1ad8351 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch @@ -0,0 +1,31 @@ +From 2303926f157f8c90cef167c43bd530793c19e480 Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 20 Aug 2020 09:39:23 +0200 +Subject: [PATCH] hotspot: enable -Wno-error + +As we don't want to deal with compiler warnings in OpenEmbedded disable +them for now. + +Upstream-Status: Pending + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + hotspot/make/linux/makefiles/gcc.make | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make +index cd9511e5..94412c8f 100644 +--- a/hotspot/make/linux/makefiles/gcc.make ++++ b/hotspot/make/linux/makefiles/gcc.make +@@ -200,8 +200,8 @@ else + CFLAGS += -pipe + endif + +-# Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++# Compiler warnings are not treated as errors ++WARNINGS_ARE_ERRORS = -Wno-error + + ifeq ($(USE_CLANG), true) + # However we need to clean the code up before we can unrestrictedly enable this option with Clang diff --git a/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-add-missing-includes-for-shark-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-add-missing-includes-for-shark-build-pt2.patch new file mode 100644 index 0000000..a2e4726 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-add-missing-includes-for-shark-build-pt2.patch @@ -0,0 +1,32 @@ +From d497bc0b36be083400d2802019ffdf49f5d5ca94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Thu, 20 Aug 2020 10:10:55 +0200 +Subject: [PATCH 1013/1013] hotspot: add missing includes for shark build (pt2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + src/cpu/zero/vm/entry_zero.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hotspot/src/cpu/zero/vm/entry_zero.hpp b/hotspot/src/cpu/zero/vm/entry_zero.hpp +index 73987f061..c5f50672b 100644 +--- a/hotspot/src/cpu/zero/vm/entry_zero.hpp ++++ b/hotspot/src/cpu/zero/vm/entry_zero.hpp +@@ -26,6 +26,8 @@ + #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP + #define CPU_ZERO_VM_ENTRY_ZERO_HPP + ++#include "utilities/globalDefinitions.hpp" ++#include "utilities/exceptions.hpp" + #include "interpreter/cppInterpreter.hpp" + + class ZeroEntry { +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch b/recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch index bedc448..d4294d2 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch @@ -1,19 +1,21 @@ -From 658adc5b6567e9a6df56beabb8d226a9b4d8e762 Mon Sep 17 00:00:00 2001 +From f4d687a4d6ddb08cae3bcce46257ea57544294c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Thu, 16 Aug 2018 02:27:44 +0100 -Subject: [PATCH] hotspot/aarch32: fix missing return values +Subject: [PATCH 1201/1202] hotspot/aarch32: fix missing return values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | 3 +++ - hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp | 1 + + src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | 3 +++ + src/cpu/aarch32/vm/relocInfo_aarch32.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp -index cd291bf2..4ba98c68 100644 +index 8aae15af2..76b6f1fe9 100644 --- a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp +++ b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp @@ -158,16 +158,19 @@ static Register as_reg(LIR_Opr op) { @@ -37,7 +39,7 @@ index cd291bf2..4ba98c68 100644 Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp, Address::InsnDataType type) { diff --git a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp -index 979d53c9..c0b1a4c7 100644 +index 979d53c98..c0b1a4c7a 100644 --- a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp +++ b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp @@ -87,6 +87,7 @@ address Relocation::pd_call_destination(address orig_addr) { @@ -49,5 +51,5 @@ index 979d53c9..c0b1a4c7 100644 void Relocation::pd_set_call_destination(address x) { -- -2.18.0 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch b/recipes-core/openjdk/patches-openjdk-8/1202-hotspot-aarch32-remaining-musl-fixes.patch index 1140887..12137c1 100644 --- a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1202-hotspot-aarch32-remaining-musl-fixes.patch @@ -1,7 +1,7 @@ -From 4bab4a4468a59e303e8d05a409a07a24c2342452 Mon Sep 17 00:00:00 2001 +From 4726119a39e937ab1a70335a6bc89645742d44fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 20 Aug 2018 12:38:38 +0100 -Subject: [PATCH] hotspot: remaining musl fixes (aarch32) +Subject: [PATCH 1202/1202] hotspot/aarch32: remaining musl fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,12 +14,13 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [OE specific] Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp | 1 - + src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp b/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp -index 052a423c..93a315e4 100644 +index 2883fc17f..162504301 100644 --- a/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp +++ b/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp @@ -75,7 +75,6 @@ @@ -31,5 +32,5 @@ index 052a423c..93a315e4 100644 #define REG_FP 29 #define SPELL_REG_SP "sp" -- -2.11.0 +2.26.2 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/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch index 0216c68..e4aa48f 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/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch @@ -1,8 +1,8 @@ -From 3dffe06da016a959f1d8c3afc292ab92a9d4d137 Mon Sep 17 00:00:00 2001 +From 2e611155c42352c1a0c15078681c6712711f6c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 13 Aug 2018 17:03:56 +0100 -Subject: [PATCH] hotspot/aarch64: Fix further functions with a missing return - value. +Subject: [PATCH 1401/1402] hotspot/aarch64: Add missing return value to + LIR_Assembler::as_Address MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,17 +15,19 @@ Content-Transfer-Encoding: 8bit |# Parent 3ade0115344b77e6d00462044e0cf68722685bfe PR3519: Fix further functions with a missing return value. -Signed-off-by: André Draszik <andre.draszik@jci.com> Upstream-Status: Backport + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 1 + + src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp -index 4e98cb39..bbc81b4a 100644 +index 7b85119c3..074e71a7d 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp -@@ -205,6 +205,7 @@ Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp) { +@@ -207,6 +207,7 @@ Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp) { return Address(base, tmp, Address::lsl(addr->scale())); } } @@ -34,5 +36,5 @@ index 4e98cb39..bbc81b4a 100644 Address LIR_Assembler::as_Address_hi(LIR_Address* addr) { -- -2.18.0 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch b/recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch index 436f012..2aafd82 100644 --- a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch @@ -1,7 +1,7 @@ -From 8e8e79c136fe56db119fd9a76fb881e96727c840 Mon Sep 17 00:00:00 2001 +From 033183cd3598ff8ba4a40ef529dfad89c6226ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 15:33:17 +0000 -Subject: [PATCH] hotspot: remaining musl fixes (aarch64) +Subject: [PATCH 1402/1402] hotspot/aarch64: remaining musl fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,24 +12,26 @@ Content-Transfer-Encoding: 8bit | ^~~~~~~~~~~~~~~ Upstream-Status: Inappropriate [OE specific] + Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 2 +- + src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -index 8b985693..23f196cd 100644 +index 27dcbfa97..33779ae57 100644 --- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp -@@ -75,7 +75,7 @@ +@@ -72,7 +72,7 @@ # include <pwd.h> # include <poll.h> # include <ucontext.h> -# include <fpu_control.h> +# include <linux/types.h> /* provides __u64 */ - #ifdef BUILTIN_SIM - #define REG_SP REG_RSP + #define REG_FP 29 + -- -2.16.1 +2.26.2 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..244d2b4 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 @@ -From 97d6911fb581f9e44785db29abbf97ce77713f50 Mon Sep 17 00:00:00 2001 +From dcf3e46758fa5e77ce6fb4b3f51867bb5186f8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Fri, 2 Mar 2018 11:13:08 +0000 -Subject: [PATCH 1/9] jdk: comparison between pointer and integer +Subject: [PATCH] jdk: comparison between pointer and integer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -18,15 +18,18 @@ jdk/src/share/native/java/net/net_util.c:225:13: note: in expansion of macro 'CH Backport a patch to fix this. Upstream-Status: Backport [http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/90c643593ed7] + Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - jdk/src/share/native/java/net/net_util.c | 15 +++++++-------- - jdk/src/share/native/java/net/net_util.h | 8 ++++---- - jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 4 ++-- + jdk/src/share/native/java/net/net_util.c | 15 +++++++-------- + jdk/src/share/native/java/net/net_util.h | 8 ++++---- + .../solaris/native/java/net/Inet6AddressImpl.c | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c -index 2194e2e6..00c9e2ac 100644 +index b1b8223a..2eee6261 100644 --- a/jdk/src/share/native/java/net/net_util.c +++ b/jdk/src/share/native/java/net/net_util.c @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { @@ -65,7 +68,7 @@ index 2194e2e6..00c9e2ac 100644 jobject holder; jbyteArray addr; -@@ -202,7 +202,6 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { +@@ -208,7 +208,6 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { jobject iaObj; #ifdef AF_INET6 if (him->sa_family == AF_INET6) { @@ -73,8 +76,8 @@ index 2194e2e6..00c9e2ac 100644 #ifdef WIN32 struct SOCKADDR_IN6 *him6 = (struct SOCKADDR_IN6 *)him; #else -@@ -218,11 +217,12 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { - setInetAddress_family(env, iaObj, IPv4); +@@ -226,11 +225,12 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { + JNU_CHECK_EXCEPTION_RETURN(env, NULL); } else { jint scope; - int ret; @@ -86,9 +89,9 @@ index 2194e2e6..00c9e2ac 100644 + if (ret == JNI_FALSE) + return NULL; setInetAddress_family(env, iaObj, IPv6); + JNU_CHECK_EXCEPTION_RETURN(env, NULL); scope = getScopeID(him); - setInet6Address_scopeid(env, iaObj, scope); -@@ -269,7 +269,6 @@ NET_SockaddrEqualsInetAddress(JNIEnv *env, struct sockaddr *him, jobject iaObj) +@@ -282,7 +282,6 @@ NET_SockaddrEqualsInetAddress(JNIEnv *env, struct sockaddr *him, jobject iaObj) return JNI_FALSE; } } else { @@ -118,10 +121,10 @@ index c8a5e68c..176ca586 100644 extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c -index e29a25da..23ec2985 100644 +index 0a51a365..dcc348cf 100644 --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c -@@ -403,7 +403,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, +@@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, } while (iterator != NULL) { @@ -130,7 +133,7 @@ index e29a25da..23ec2985 100644 if (iterator->ai_family == AF_INET) { jobject iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID); if (IS_NULL(iaObj)) { -@@ -423,7 +423,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, +@@ -416,7 +416,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, goto cleanupAndReturn; } ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr)); @@ -139,6 +142,3 @@ index e29a25da..23ec2985 100644 ret = NULL; goto cleanupAndReturn; } --- -2.16.2 - 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..5f8981d 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 @@ -From a6746c1ee43a63e79b5405e40c463d00160bc02e Mon Sep 17 00:00:00 2001 +From a1a63e85513aa3501588b02940e4f0e93e992e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 13:36:53 +0000 -Subject: [PATCH 3/9] jdk: Allow using a system-installed libjpeg +Subject: [PATCH] jdk: Allow using a system-installed libjpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -20,66 +20,21 @@ Issues fixed on top of debian patch: Upstream-Status: Backport Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - common/autoconf/libraries.m4 | 35 +++++++++-- - jdk/make/lib/Awt2dLibraries.gmk | 69 +++++++++++++++------- - .../sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +- - .../sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- - .../classes/sun/awt/image/JPEGImageDecoder.java | 2 +- - .../share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +- - 6 files changed, 81 insertions(+), 31 deletions(-) + jdk/make/lib/Awt2dLibraries.gmk | 69 +++++++++++++------ + .../imageio/plugins/jpeg/JPEGImageReader.java | 2 +- + .../imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- + .../sun/awt/image/JPEGImageDecoder.java | 2 +- + .../native/sun/awt/image/jpeg/imageioJPEG.c | 2 +- + 5 files changed, 51 insertions(+), 26 deletions(-) -diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 -index 91b8ed7f..3f5f69b1 100644 ---- a/common/autoconf/libraries.m4 -+++ b/common/autoconf/libraries.m4 -@@ -595,11 +595,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], - # Check for the jpeg library - # - -- USE_EXTERNAL_LIBJPEG=true -- AC_CHECK_LIB(jpeg, main, [], -- [ USE_EXTERNAL_LIBJPEG=false -- AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source]) -- ]) -+ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg], -+ [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) -+ -+ AC_MSG_CHECKING([for which libjpeg to use]) -+ -+ # default is bundled -+ DEFAULT_LIBJPEG=bundled -+ -+ # -+ # if user didn't specify, use DEFAULT_LIBJPEG -+ # -+ if test "x${with_libjpeg}" = "x"; then -+ with_libjpeg=${DEFAULT_LIBJPEG} -+ fi -+ -+ AC_MSG_RESULT(${with_libjpeg}) -+ -+ if test "x${with_libjpeg}" = "xbundled"; then -+ USE_EXTERNAL_LIBJPEG=false -+ elif test "x${with_libjpeg}" = "xsystem"; then -+ AC_CHECK_HEADER(jpeglib.h, [], -+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])]) -+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [], -+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])]) -+ -+ USE_EXTERNAL_LIBJPEG=true -+ else -+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled']) -+ fi -+ - AC_SUBST(USE_EXTERNAL_LIBJPEG) - - ############################################################################### diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index aa7efc4a..8872a8e8 100644 +index 9368a9d5..7fffcafc 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -707,21 +707,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) +@@ -702,21 +702,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) ########################################################################################## @@ -110,7 +65,7 @@ index aa7efc4a..8872a8e8 100644 # Suppress gcc warnings like "variable might be clobbered by 'longjmp' # or 'vfork'": this warning indicates that some variable is placed to # a register by optimized compiler and it's value might be lost on longjmp(). -@@ -733,37 +736,50 @@ endif +@@ -728,37 +731,50 @@ endif # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # ifeq ($(CC_43_OR_NEWER), 1) @@ -175,7 +130,7 @@ index aa7efc4a..8872a8e8 100644 ########################################################################################## -@@ -1213,6 +1229,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1149,6 +1165,13 @@ ifndef BUILD_HEADLESS_ONLY GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib endif @@ -189,7 +144,7 @@ index aa7efc4a..8872a8e8 100644 ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1273,11 +1296,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1205,11 +1228,13 @@ ifndef BUILD_HEADLESS_ONLY EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ LANG := C, \ OPTIMIZATION := LOW, \ @@ -206,7 +161,7 @@ index aa7efc4a..8872a8e8 100644 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ 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 -index 5c93d89e..5efc00a7 100644 +index 8f58f5b3..fcbab826 100644 --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java @@ -89,7 +89,7 @@ public class JPEGImageReader extends ImageReader { @@ -257,6 +212,3 @@ index 7e1d8c99..8cac61da 100644 #undef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) --- -2.16.2 - 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/2003-jdk-Allow-using-a-system-installed-libpng.patch index 658ba32..dbc714e 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch @@ -1,7 +1,7 @@ -From 549100e3e687d2c844eeebe22a7dcbf7ed50406e Mon Sep 17 00:00:00 2001 +From ce26d6cbb550039516432993894d65660b7c9e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 13:43:04 +0000 -Subject: [PATCH 4/9] jdk: Allow using a system-installed libpng +Subject: [PATCH] jdk: Allow using a system-installed libpng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -17,82 +17,18 @@ Issues fixed on top of debian patch: Upstream-Status: Backport Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++ - common/autoconf/spec.gmk.in | 1 + - jdk/make/lib/Awt2dLibraries.gmk | 12 +++++-- - .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +- - 4 files changed, 52 insertions(+), 5 deletions(-) + jdk/make/lib/Awt2dLibraries.gmk | 12 +++++++++--- + .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- + 2 files changed, 10 insertions(+), 5 deletions(-) -diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 -index 3f5f69b1..e419a050 100644 ---- a/common/autoconf/libraries.m4 -+++ b/common/autoconf/libraries.m4 -@@ -664,6 +664,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], - fi - AC_SUBST(USE_EXTERNAL_LIBGIF) - -+ ############################################################################### -+ # -+ # Check for the png library -+ # -+ -+ AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng], -+ [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) -+ -+ AC_CHECK_LIB(png, png_sig_cmp, -+ [ LIBPNG_FOUND=yes ], -+ [ LIBPNG_FOUND=no ]) -+ -+ AC_MSG_CHECKING([for which libpng to use]) -+ -+ # default is bundled -+ DEFAULT_LIBPNG=bundled -+ -+ # -+ # if user didn't specify, use DEFAULT_LIBPNG -+ # -+ if test "x${with_libpng}" = "x"; then -+ with_libpng=${DEFAULT_LIBPNG} -+ fi -+ -+ -+ if test "x${with_libpng}" = "xbundled"; then -+ USE_EXTERNAL_LIBPNG=false -+ AC_MSG_RESULT([bundled]) -+ elif test "x${with_libpng}" = "xsystem"; then -+ if test "x${LIBPNG_FOUND}" = "xyes"; then -+ USE_EXTERNAL_LIBPNG=true -+ AC_MSG_RESULT([system]) -+ else -+ AC_MSG_RESULT([system not found]) -+ AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!]) -+ fi -+ else -+ AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled']) -+ fi -+ AC_SUBST(USE_EXTERNAL_LIBPNG) -+ - ############################################################################### - # - # Check for the zlib library -diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in -index 1c418f29..2c802c0a 100644 ---- a/common/autoconf/spec.gmk.in -+++ b/common/autoconf/spec.gmk.in -@@ -567,6 +567,7 @@ endif - ENABLE_JFR=@ENABLE_JFR@ - ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ - USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ -+USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@ - USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ - USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ - LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index 8872a8e8..c577951a 100644 +index 7fffcafc..7f42e09c 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -1219,7 +1219,6 @@ endif +@@ -1155,7 +1155,6 @@ endif ifndef BUILD_HEADLESS_ONLY LIBSPLASHSCREEN_DIRS := \ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ @@ -100,7 +36,7 @@ index 8872a8e8..c577951a 100644 $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen ifeq ($(USE_EXTERNAL_LIBGIF), true) -@@ -1236,6 +1235,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1172,6 +1171,13 @@ ifndef BUILD_HEADLESS_ONLY LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg endif @@ -114,7 +50,7 @@ index 8872a8e8..c577951a 100644 ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1297,12 +1303,12 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1229,12 +1235,12 @@ ifndef BUILD_HEADLESS_ONLY LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ @@ -143,6 +79,3 @@ index 3599433e..5bf002ea 100644 #include <setjmp.h> #define SIG_BYTES 8 --- -2.16.2 - 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..91ec91f 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 @@ -From df9c5738c4a8a00ba65948503ff0c0cfa2f17e95 Mon Sep 17 00:00:00 2001 +From 44512cfca65ea5b7b6d1732560d8aa2cd221de22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 09:28:06 +0000 -Subject: [PATCH 7/9] jdk: use correct include for poll +Subject: [PATCH] jdk: use correct include for poll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -24,6 +24,8 @@ the following command: Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- jdk/src/aix/native/java/net/aix_close.c | 2 +- jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- @@ -38,10 +40,10 @@ Signed-off-by: André Draszik <andre.draszik@jci.com> 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c -index 8c070e4b..126f4d7d 100644 +index 90d57b42..fbeb73ef 100644 --- a/jdk/src/aix/native/java/net/aix_close.c +++ b/jdk/src/aix/native/java/net/aix_close.c -@@ -51,7 +51,7 @@ +@@ -54,7 +54,7 @@ #include <unistd.h> #include <errno.h> @@ -64,7 +66,7 @@ index 70064b89..c10c602b 100644 #include <fcntl.h> #include <stddef.h> diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c -index 71cbdf8c..170957e7 100644 +index 373c5e36..9aafbc09 100644 --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c @@ -28,7 +28,7 @@ @@ -77,10 +79,10 @@ index 71cbdf8c..170957e7 100644 #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ #include <netinet/in.h> diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c -index af57cef3..64d04088 100644 +index 89a20707..511ab845 100644 --- a/jdk/src/solaris/native/java/net/bsd_close.c +++ b/jdk/src/solaris/native/java/net/bsd_close.c -@@ -36,7 +36,7 @@ +@@ -38,7 +38,7 @@ #include <sys/uio.h> #include <unistd.h> #include <errno.h> @@ -90,10 +92,10 @@ index af57cef3..64d04088 100644 /* * Stack allocated by thread when doing blocking operation diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c -index 98e1ce09..85fba135 100644 +index eacc2afd..159ca132 100644 --- a/jdk/src/solaris/native/java/net/linux_close.c +++ b/jdk/src/solaris/native/java/net/linux_close.c -@@ -34,7 +34,7 @@ +@@ -36,7 +36,7 @@ #include <sys/uio.h> #include <unistd.h> #include <errno.h> @@ -167,6 +169,3 @@ index 33e062e0..819fcabd 100644 #endif #include "socket_md.h" --- -2.16.2 - 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..b38dcb3 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 @@ -From a063ee68bc0dd7dbf9737df4ee191e98796f2f6a Mon Sep 17 00:00:00 2001 +From ddcec385593175ee01b9f000457a34b3d7ab5ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 09:28:06 +0000 -Subject: [PATCH 8/9] jdk: use correct include for signal +Subject: [PATCH] jdk: use correct include for signal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,6 +25,8 @@ the following command: Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- jdk/src/macosx/javavm/export/jvm_md.h | 2 +- @@ -84,6 +86,3 @@ index 5e2a78b7..204f0441 100644 /* Also defined in net/linux_close.c */ #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) #elif __solaris__ --- -2.16.2 - 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..4773f20 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 @@ -From 8ef989f82b29655e8d4532f14d5aa12a2999d850 Mon Sep 17 00:00:00 2001 +From f27d54f62c5a5667c04b78ea1434a5db36358261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Fri, 2 Mar 2018 13:58:07 +0000 -Subject: [PATCH 10/10] jdk: disable backtrace() (musl build fix) +Subject: [PATCH] jdk: disable backtrace() (musl build fix) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,12 +14,14 @@ to fix the build on musl. Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c -index 71d41f37..d3dc47cb 100644 +index 95d2baff..41dfa992 100644 --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c @@ -27,7 +27,7 @@ @@ -31,7 +33,7 @@ index 71d41f37..d3dc47cb 100644 #include <execinfo.h> #endif -@@ -799,7 +799,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv +@@ -796,7 +796,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv return ret; } @@ -40,6 +42,3 @@ index 71d41f37..d3dc47cb 100644 void print_stack(void) { void *array[10]; --- -2.16.2 - 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..d205ae5 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch @@ -0,0 +1,30 @@ +From 095da0fd8597f0ed8d95d226300e8d6661ac2383 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 13:25:12 +0100 +Subject: [PATCH] jdk: no genx11 in headless + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + jdk/make/GenerateSources.gmk | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/jdk/make/GenerateSources.gmk b/jdk/make/GenerateSources.gmk +index ba443f7d..2170150a 100644 +--- a/jdk/make/GenerateSources.gmk ++++ b/jdk/make/GenerateSources.gmk +@@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows) + GENSRC += $(GENSRC_OSX_ICONS) + endif + +- ifneq ($(OPENJDK_TARGET_OS), macosx) +- include gensrc/GensrcX11Wrappers.gmk +- GENSRC += $(GENSRC_X11WRAPPERS) ++ ifndef BUILD_HEADLESS_ONLY ++ ifneq ($(OPENJDK_TARGET_OS), macosx) ++ include gensrc/GensrcX11Wrappers.gmk ++ GENSRC += $(GENSRC_X11WRAPPERS) ++ endif + endif + endif + 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..115914a 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,36 @@ ---- jdk/make/lib/Awt2dLibraries.gmk.orig -+++ jdk/make/lib/Awt2dLibraries.gmk -@@ -235,6 +235,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) +From bc6450aaa4b7652ee034423f1d04cb439152eaf6 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 2 Jan 2020 13:26:42 +0100 +Subject: [PATCH] jdk: no unused deps + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + jdk/make/CompileNativeLibraries.gmk | 2 ++ + jdk/make/lib/Awt2dLibraries.gmk | 30 ++++++++++++++----- + jdk/src/solaris/native/sun/awt/jawt.c | 2 +- + jdk/src/solaris/native/sun/awt/utility/rect.h | 2 +- + 4 files changed, 26 insertions(+), 10 deletions(-) + +diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk +index c23b958b..2984302f 100644 +--- a/jdk/make/CompileNativeLibraries.gmk ++++ b/jdk/make/CompileNativeLibraries.gmk +@@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk + + include lib/Awt2dLibraries.gmk + ++ifndef BUILD_SOUNDLESS_ONLY + include lib/SoundLibraries.gmk ++endif + + # Include the corresponding custom file, if present. + -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk +diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk +index 7f42e09c..10232b61 100644 +--- a/jdk/make/lib/Awt2dLibraries.gmk ++++ b/jdk/make/lib/Awt2dLibraries.gmk +@@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting endif @@ -11,7 +41,7 @@ LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ $(X_CFLAGS) \ $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) -@@ -792,17 +796,28 @@ ifeq ($(BUILD_HEADLESS), true) +@@ -808,17 +812,28 @@ ifeq ($(BUILD_HEADLESS), true) -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) @@ -45,7 +75,7 @@ OGLBlitLoops.c \ OGLBufImgOps.c \ OGLContext.c \ -@@ -815,10 +830,9 @@ ifeq ($(BUILD_HEADLESS), true) +@@ -831,10 +846,9 @@ ifeq ($(BUILD_HEADLESS), true) OGLSurfaceData.c \ OGLTextRenderer.c \ OGLVertexCache.c \ @@ -58,20 +88,10 @@ LIBAWT_HEADLESS_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) ---- jdk/make/CompileNativeLibraries.gmk.orig -+++ jdk/make/CompileNativeLibraries.gmk -@@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk - - include lib/Awt2dLibraries.gmk - -+ifndef BUILD_SOUNDLESS_ONLY - include lib/SoundLibraries.gmk -+endif - - # Include the corresponding custom file, if present. - -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk ---- jdk/src/solaris/native/sun/awt/jawt.c.orig -+++ jdk/src/solaris/native/sun/awt/jawt.c +diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c +index 64284bc6..b3584c7e 100644 +--- a/jdk/src/solaris/native/sun/awt/jawt.c ++++ b/jdk/src/solaris/native/sun/awt/jawt.c @@ -33,7 +33,7 @@ */ JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt) @@ -81,8 +101,10 @@ /* there are no AWT libs available at all */ return JNI_FALSE; #else ---- jdk/src/solaris/native/sun/awt/utility/rect.h.orig -+++ jdk/src/solaris/native/sun/awt/utility/rect.h +diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h +index ceea38f4..8d85782b 100644 +--- a/jdk/src/solaris/native/sun/awt/utility/rect.h ++++ b/jdk/src/solaris/native/sun/awt/utility/rect.h @@ -28,7 +28,7 @@ #ifndef _AWT_RECT_H #define _AWT_RECT_H diff --git a/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch new file mode 100644 index 0000000..3c7dc24 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch @@ -0,0 +1,26 @@ +From 83d3b8427c8996f3a0359d218f174b46fe9120c8 Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 20 Aug 2020 11:24:40 +0200 +Subject: [PATCH] jdk: make: use gcc instead of ld for genSocketOptionRegistry + +Upstream-Status: Pending + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + +--- + jdk/make/gensrc/GensrcMisc.gmk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jdk/make/gensrc/GensrcMisc.gmk b/jdk/make/gensrc/GensrcMisc.gmk +index 9db5c9d6..84a3c27e 100644 +--- a/jdk/make/gensrc/GensrcMisc.gmk ++++ b/jdk/make/gensrc/GensrcMisc.gmk +@@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \ + INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \ + LANG := C, \ + CC := $(BUILD_CC), \ +- LDEXE := $(BUILD_LD), \ ++ LDEXE := $(BUILD_CC), \ + OBJECT_DIR := $(GENSRC_SOR_BIN), \ + OUTPUT_DIR := $(GENSRC_SOR_BIN), \ + PROGRAM := genSocketOptionRegistry)) 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 @@ ---- common/autoconf/basics.m4.orig -+++ common/autoconf/basics.m4 -@@ -448,7 +448,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], - files_present=`$LS $OUTPUT_ROOT` - # Configure has already touched config.log and confdefs.h in the current dir when this check - # is performed. -- filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \ -+ filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's,aclocal-copy,,g' -e 's/ //g' \ - | $TR -d '\n'` - if test "x$filtered_files" != x; then - 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 @@ -# HG changeset patch -# User Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> -# Date 1537519446 -7200 -# Fri Sep 21 10:44:06 2018 +0200 -# Node ID 213da2c3ee54a558abd30b0230afa40d4b4e7f83 -# Parent 80ee2541504ec08d65da9d968a18a00a69858ce0 -Handle format error for GCC >= 7 - -diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp ---- a/hotspot/src/share/vm/adlc/output_c.cpp -+++ b/hotspot/src/share/vm/adlc/output_c.cpp -@@ -436,9 +436,11 @@ - for (i = maxcycleused; i > 0; i /= 10) - cycledigit++; - -- int maskdigit = 0; -- for (i = rescount; i > 0; i /= 10) -+ int maskdigit = 1; -+ for (i = rescount / 10; i > 0; i /= 10) - maskdigit++; -+ if (maskdigit > 10) -+ maskdigit = 10; - - static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; - 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 @@ -makefiles: Add missing EXTRA_LDFLAGS to certain files - -EXTRA_LDFLAGS were not used when building certain shared objects. This -means that the Yocto specific linker flags were lost, which caused build -failures due to a bad hash style. - -Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> - -Upstream-Status: Pending ---- - hotspot/make/linux/makefiles/jsig.make | 2 +- - hotspot/make/linux/makefiles/saproc.make | 2 +- - hotspot/make/linux/makefiles/vm.make | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git hotspot/make/linux/makefiles/jsig.make hotspot/make/linux/makefiles/jsig.make -index ce29eb1..e1d6c07 100644 ---- hotspot/make/linux/makefiles/jsig.amake -+++ hotspot/make/linux/makefiles/jsig.make -@@ -44,7 +44,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig - # cause problems with interposing. See CR: 6466665 - # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) - --LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) -+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) - - # DEBUG_BINARIES overrides everything, use full -g debug information - ifeq ($(DEBUG_BINARIES), true) -diff --git hotspot/make/linux/makefiles/saproc.make hotspot/make/linux/makefiles/saproc.make -index 7c6e4a8..369a0ba 100644 ---- hotspot/make/linux/makefiles/saproc.make -+++ hotspot/make/linux/makefiles/saproc.make -@@ -73,7 +73,7 @@ ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR - else - ALT_SAINCDIR= - endif --SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) -+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) - - SAARCH ?= $(BUILDARCH) - -diff --git hotspot/make/linux/makefiles/vm.make hotspot/make/linux/makefiles/vm.make -index 1a48df9..72f8d11 100644 ---- hotspot/make/linux/makefiles/vm.make -+++ hotspot/make/linux/makefiles/vm.make -@@ -122,7 +122,7 @@ CFLAGS += $(CFLAGS/NOEX) - - # Extra flags from gnumake's invocation or environment - CFLAGS += $(EXTRA_CFLAGS) --LFLAGS += $(EXTRA_CFLAGS) -+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) - - # Don't set excutable bit on stack segment - # the same could be done by separate execstack command --- -2.7.4 - 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 @@ ---- common/autoconf/toolchain.m4.orig -+++ common/autoconf/toolchain.m4 -@@ -77,7 +77,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSI - # $2 = human readable name of compiler (C or C++) - AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], - [ -- COMPILER=[$]$1 -+ COMPILER="[$]$1" - COMPILER_NAME=$2 - - if test "x$OPENJDK_TARGET_OS" = xsolaris; then -@@ -174,64 +174,37 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], - [ - COMPILER_NAME=$2 - -- $1= -+ FOUND_$1= -+ -+ if test "x[$]$1" != "x"; then -+ FOUND_$1="[$]$1" -+ fi -+ - # If TOOLS_DIR is set, check for all compiler names in there first - # before checking the rest of the PATH. -- if test -n "$TOOLS_DIR"; then -+ if test "x[$]FOUND_$1" = x -a -n "$TOOLS_DIR"; then - PATH_save="$PATH" - PATH="$TOOLS_DIR" - AC_PATH_PROGS(TOOLS_DIR_$1, $3) -- $1=$TOOLS_DIR_$1 -+ FOUND_$1=$TOOLS_DIR_$1 - PATH="$PATH_save" - fi - - # AC_PATH_PROGS can't be run multiple times with the same variable, - # so create a new name for this run. -- if test "x[$]$1" = x; then -+ if test "x[$]FOUND_$1" = x; then - AC_PATH_PROGS(POTENTIAL_$1, $3) -- $1=$POTENTIAL_$1 -+ FOUND_$1=$POTENTIAL_$1 - fi - -- if test "x[$]$1" = x; then -+ if test "x[$]FOUND_$1" = x; then - HELP_MSG_MISSING_DEPENDENCY([devkit]) - AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG]) - fi -- BASIC_FIXUP_EXECUTABLE($1) -- TEST_COMPILER="[$]$1" -- # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links -- # to 'xlc' but it is crucial that we invoke the compiler with the right name! -- if test "x$OPENJDK_BUILD_OS" != xaix; then -- AC_MSG_CHECKING([resolved symbolic links for $1]) -- BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER) -- AC_MSG_RESULT([$TEST_COMPILER]) -- fi -- AC_MSG_CHECKING([if $1 is disguised ccache]) -- -- COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"` -- if test "x$COMPILER_BASENAME" = "xccache"; then -- AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler]) -- # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache. -- # We want to control ccache invocation ourselves, so ignore this cc and try -- # searching again. -- -- # Remove the path to the fake ccache cc from the PATH -- RETRY_COMPILER_SAVED_PATH="$PATH" -- COMPILER_DIRNAME=`$DIRNAME [$]$1` -- PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`" -- -- # Try again looking for our compiler -- AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3) -- BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1) -- PATH="$RETRY_COMPILER_SAVED_PATH" -- -- AC_MSG_CHECKING([for resolved symbolic links for $1]) -- BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1) -- AC_MSG_RESULT([$PROPER_COMPILER_$1]) -- $1="$PROPER_COMPILER_$1" -- else -- AC_MSG_RESULT([no, keeping $1]) -- $1="$TEST_COMPILER" -- fi -+ BASIC_FIXUP_EXECUTABLE(FOUND_$1) -+ TEST_COMPILER="[$]FOUND_$1" -+ -+ $1="$TEST_COMPILER" - TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME]) - ]) - -@@ -265,12 +238,12 @@ AC_DEFUN([TOOLCHAIN_SETUP_PATHS], - # otherwise we might pick up cross-compilers which don't use standard naming. - # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have - # to wait until they are properly discovered. -- AC_PATH_PROGS(BUILD_CC, [cl cc gcc]) -- BASIC_FIXUP_EXECUTABLE(BUILD_CC) -- AC_PATH_PROGS(BUILD_CXX, [cl CC g++]) -- BASIC_FIXUP_EXECUTABLE(BUILD_CXX) -- AC_PATH_PROG(BUILD_LD, ld) -- BASIC_FIXUP_EXECUTABLE(BUILD_LD) -+ AS_IF([test "x${BUILD_CC}" = "x"], [AC_PATH_PROGS(BUILD_CC, [cl cc gcc]) -+ BASIC_FIXUP_EXECUTABLE(BUILD_CC)]) -+ AS_IF([test "x${BUILD_CXX}" = "x"], [AC_PATH_PROGS(BUILD_CXX, [cl CC g++]) -+ BASIC_FIXUP_EXECUTABLE(BUILD_CXX)]) -+ AS_IF([test "x${BUILD_LD}" = "x"], [AC_PATH_PROG(BUILD_LD, ld) -+ BASIC_FIXUP_EXECUTABLE(BUILD_LD)]) - fi - AC_SUBST(BUILD_CC) - AC_SUBST(BUILD_CXX) ---- common/autoconf/basics.m4.orig -+++ common/autoconf/basics.m4 -@@ -171,8 +171,15 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], - fi - fi - -+ # First separate the path from the arguments. This will split at the first -+ # space. -+ complete="[$]$1" -+ path="${complete%% *}" -+ tmp="$complete EOL" -+ arguments="${tmp#* }" -+ - if test "x$READLINK" != x; then -- $1=`$READLINK -f [$]$1` -+ new_path=`$READLINK -f $path` - else - # Save the current directory for restoring afterwards - STARTDIR=$PWD -@@ -198,8 +205,9 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], - let COUNTER=COUNTER+1 - done - cd $STARTDIR -- $1=$sym_link_dir/$sym_link_file -+ new_path=$sym_link_dir/$sym_link_file - fi -+ $1="$new_path ${arguments% *}" - fi - ]) - 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 @@ -Delay $CXX insertion until after make has evaluated the comma-separated list, -as any comma separated parameters in CXX (such as assembler arguments) would -break the build - -Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> - -Upstream-Status: Pending - ---- ---- make/common/NativeCompilation.gmk -+++ make/common/NativeCompilation.gmk -@@ -376,7 +376,7 @@ define SetupNativeCompilation - $$(foreach p,$$($1_SRCS), \ - $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ - $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \ -- $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS)))) -+ $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$$(CXX),$$($1_ASFLAGS)))) - - # On windows we need to create a resource file - 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 @@ -# HG changeset patch -# User enevill -# Date 1430816900 0 -# Tue May 05 09:08:20 2015 +0000 -# Node ID 88d2b7d7285281d41bcff45af0dd983b0f72811e -# Parent 51f5501a54a62aceed6342e7ea3a9a3c67f3885d -8078245: AARCH64: JDK fails to build due to undefined symbol in libpng -Summary: Add -DPNG_ARM_NEON_OPT=0 to LIBSPLASHSCREEN_CFLAGS flags -Reviewed-by: dholmes, ihse, erikj - -Upstream-Status: Backport - -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - jdk/make/lib/Awt2dLibraries.gmk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git jdk/make/lib/Awt2dLibraries.gmk jdk/make/lib/Awt2dLibraries.gmk ---- jdk/make/lib/Awt2dLibraries.gmk -+++ jdk/make/lib/Awt2dLibraries.gmk -@@ -1205,7 +1205,7 @@ ifndef BUILD_HEADLESS_ONLY - LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen - endif - -- LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \ -+ LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \ - $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir)) - - ifeq ($(OPENJDK_TARGET_OS), macosx) diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch deleted file mode 100644 index b09745c..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hotspot/src/cpu/zero/vm/entry_zero.hpp -+++ hotspot/src/cpu/zero/vm/entry_zero.hpp -@@ -26,6 +26,8 @@ - #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP - #define CPU_ZERO_VM_ENTRY_ZERO_HPP - -+#include "utilities/globalDefinitions.hpp" -+#include "utilities/exceptions.hpp" - #include "interpreter/cppInterpreter.hpp" - - class ZeroEntry { 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 deleted file mode 100644 index 018640b..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- hotspot/src/cpu/zero/vm/entry_zero.hpp.orig -+++ hotspot/src/cpu/zero/vm/entry_zero.hpp -@@ -26,6 +26,10 @@ - #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP - #define CPU_ZERO_VM_ENTRY_ZERO_HPP - -+#include "utilities/globalDefinitions.hpp" -+#include "utilities/exceptions.hpp" -+#include "interpreter/cppInterpreter.hpp" -+ - class ZeroEntry { - public: - ZeroEntry() { ---- hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp.orig -+++ hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp -@@ -30,6 +30,10 @@ - - #ifdef CC_INTERP - -+#ifdef TARGET_ARCH_zero -+#include "entry_zero.hpp" -+#endif -+ - class CppInterpreterGenerator: public AbstractInterpreterGenerator { - protected: - // shared code sequences ---- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig -+++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp -@@ -26,6 +26,9 @@ - #include "precompiled.hpp" - #include "assembler_zero.inline.hpp" - #include "memory/resourceArea.hpp" -+#ifdef CC_INTERP -+#include "entry_zero.hpp" -+#endif - #include "nativeInst_zero.hpp" - #include "oops/oop.inline.hpp" - #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 @@ ---- hotspot/src/os/posix/vm/os_posix.cpp.orig -+++ hotspot/src/os/posix/vm/os_posix.cpp -@@ -594,7 +594,7 @@ const char* os::Posix::describe_sa_flags - strncpy(buffer, "none", size); - - const struct { -- int i; -+ unsigned i; - const char* s; - } flaginfo [] = { - { SA_NOCLDSTOP, "SA_NOCLDSTOP" }, ---- hotspot/src/share/vm/classfile/dictionary.hpp.orig -+++ hotspot/src/share/vm/classfile/dictionary.hpp -@@ -373,7 +373,7 @@ class SymbolPropertyEntry : public Hasht - - void print_on(outputStream* st) const { - symbol()->print_value_on(st); -- st->print("/mode="INTX_FORMAT, symbol_mode()); -+ st->print("/mode=" INTX_FORMAT, symbol_mode()); - st->print(" -> "); - bool printed = false; - if (method() != NULL) { ---- hotspot/src/share/vm/code/exceptionHandlerTable.cpp.orig -+++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp -@@ -186,7 +186,7 @@ uint ImplicitExceptionTable::at( uint ex - void ImplicitExceptionTable::print(address base) const { - tty->print("{"); - for( uint i=0; i<len(); i++ ) -- tty->print("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1)); -+ tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1)); - tty->print_cr("}"); - } - ---- hotspot/src/share/vm/code/nmethod.cpp.orig -+++ hotspot/src/share/vm/code/nmethod.cpp -@@ -2344,7 +2344,7 @@ public: - void maybe_print(oop* p) { - if (_print_nm == NULL) return; - if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root"); -- tty->print_cr(""PTR_FORMAT"[offset=%d] detected scavengable oop "PTR_FORMAT" (found at "PTR_FORMAT")", -+ tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")", - _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm), - (void *)(*p), (intptr_t)p); - (*p)->print(); -@@ -2725,7 +2725,7 @@ public: - _nm->print_nmethod(true); - _ok = false; - } -- tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)", -+ tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)", - (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); - } - virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); } -@@ -2849,7 +2849,7 @@ public: - _nm->print_nmethod(true); - _ok = false; - } -- tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)", -+ tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)", - (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); - (*p)->print(); - } -@@ -2894,7 +2894,7 @@ void nmethod::print() const { - print_on(tty, NULL); - - if (WizardMode) { -- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this); -+ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this); - tty->print(" for method " INTPTR_FORMAT , (address)method()); - tty->print(" { "); - if (is_in_use()) tty->print("in_use "); ---- hotspot/src/share/vm/compiler/compileBroker.cpp.orig -+++ hotspot/src/share/vm/compiler/compileBroker.cpp -@@ -203,7 +203,7 @@ class CompilationLog : public StringEven - } - - void log_nmethod(JavaThread* thread, nmethod* nm) { -- log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]", -+ log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", - nm->compile_id(), nm->is_osr_method() ? "%" : "", - p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end())); - } ---- hotspot/src/share/vm/compiler/disassembler.cpp.orig -+++ hotspot/src/share/vm/compiler/disassembler.cpp -@@ -63,7 +63,7 @@ bool Disassembler::_tried_to_load - Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL; - Disassembler::decode_func Disassembler::_decode_instructions = NULL; - --static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH; -+static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH; - static const char decode_instructions_virtual_name[] = "decode_instructions_virtual"; - static const char decode_instructions_name[] = "decode_instructions"; - static bool use_new_version = true; ---- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp -@@ -838,18 +838,18 @@ void ConcurrentMarkSweepGeneration::prin - GenCollectedHeap* gch = GenCollectedHeap::heap(); - if (PrintGCDetails) { - if (Verbose) { -- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]", -+ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "(" SIZE_FORMAT ")]", - level(), short_name(), s, used(), capacity()); - } else { -- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]", -+ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)]", - level(), short_name(), s, used() / K, capacity() / K); - } - } - if (Verbose) { -- gclog_or_tty->print(" "SIZE_FORMAT"("SIZE_FORMAT")", -+ gclog_or_tty->print(" " SIZE_FORMAT "(" SIZE_FORMAT ")", - gch->used(), gch->capacity()); - } else { -- gclog_or_tty->print(" "SIZE_FORMAT"K("SIZE_FORMAT"K)", -+ gclog_or_tty->print(" " SIZE_FORMAT "K(" SIZE_FORMAT "K)", - gch->used() / K, gch->capacity() / K); - } - } -@@ -879,8 +879,8 @@ bool ConcurrentMarkSweepGeneration::prom - bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); - if (Verbose && PrintGCDetails) { - gclog_or_tty->print_cr( -- "CMS: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT")," -- "max_promo("SIZE_FORMAT")", -+ "CMS: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT ")," -+ "max_promo(" SIZE_FORMAT ")", - res? "":" not", available, res? ">=":"<", - av_promo, max_promotion_in_bytes); - } -@@ -966,8 +966,8 @@ void ConcurrentMarkSweepGeneration::comp - desired_free_percentage); - gclog_or_tty->print_cr(" Maximum free fraction %f", - maximum_free_percentage); -- gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000); -- gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT, -+ gclog_or_tty->print_cr(" Capactiy " SIZE_FORMAT, capacity()/1000); -+ gclog_or_tty->print_cr(" Desired capacity " SIZE_FORMAT, - desired_capacity/1000); - int prev_level = level() - 1; - if (prev_level >= 0) { -@@ -975,14 +975,14 @@ void ConcurrentMarkSweepGeneration::comp - GenCollectedHeap* gch = GenCollectedHeap::heap(); - Generation* prev_gen = gch->_gens[prev_level]; - prev_size = prev_gen->capacity(); -- gclog_or_tty->print_cr(" Younger gen size "SIZE_FORMAT, -+ gclog_or_tty->print_cr(" Younger gen size " SIZE_FORMAT, - prev_size/1000); - } -- gclog_or_tty->print_cr(" unsafe_max_alloc_nogc "SIZE_FORMAT, -+ gclog_or_tty->print_cr(" unsafe_max_alloc_nogc " SIZE_FORMAT, - unsafe_max_alloc_nogc()/1000); -- gclog_or_tty->print_cr(" contiguous available "SIZE_FORMAT, -+ gclog_or_tty->print_cr(" contiguous available " SIZE_FORMAT, - contiguous_available()/1000); -- gclog_or_tty->print_cr(" Expand by "SIZE_FORMAT" (bytes)", -+ gclog_or_tty->print_cr(" Expand by " SIZE_FORMAT " (bytes)", - expand_bytes); - } - // safe if expansion fails -@@ -1513,8 +1513,8 @@ bool CMSCollector::shouldConcurrentColle - stats().print_on(gclog_or_tty); - gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f", - stats().time_until_cms_gen_full()); -- gclog_or_tty->print_cr("free="SIZE_FORMAT, _cmsGen->free()); -- gclog_or_tty->print_cr("contiguous_available="SIZE_FORMAT, -+ gclog_or_tty->print_cr("free=" SIZE_FORMAT, _cmsGen->free()); -+ gclog_or_tty->print_cr("contiguous_available=" SIZE_FORMAT, - _cmsGen->contiguous_available()); - gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate()); - gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate()); -@@ -2792,7 +2792,7 @@ void ConcurrentMarkSweepGeneration::gc_p - assert(_numObjectsPromoted == 0, "check"); - assert(_numWordsPromoted == 0, "check"); - if (Verbose && PrintGC) { -- gclog_or_tty->print("Allocated "SIZE_FORMAT" objects, " -+ gclog_or_tty->print("Allocated " SIZE_FORMAT " objects, " - SIZE_FORMAT" bytes concurrently", - _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord)); - } -@@ -2879,7 +2879,7 @@ void ConcurrentMarkSweepGeneration::gc_e - assert(_numObjectsAllocated == 0, "check"); - assert(_numWordsAllocated == 0, "check"); - if (Verbose && PrintGC) { -- gclog_or_tty->print("Promoted "SIZE_FORMAT" objects, " -+ gclog_or_tty->print("Promoted " SIZE_FORMAT " objects, " - SIZE_FORMAT" bytes", - _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord)); - } -@@ -2890,7 +2890,7 @@ void ConcurrentMarkSweepGeneration::gc_e - if (PrintGC && Verbose) { - // Call down the chain in contiguous_available needs the freelistLock - // so print this out before releasing the freeListLock. -- gclog_or_tty->print(" Contiguous available "SIZE_FORMAT" bytes ", -+ gclog_or_tty->print(" Contiguous available " SIZE_FORMAT " bytes ", - contiguous_available()); - } - } -@@ -2978,7 +2978,7 @@ class VerifyMarkedClosure: public BitMap - HeapWord* addr = _marks->offsetToHeapWord(offset); - if (!_marks->isMarked(addr)) { - oop(addr)->print_on(gclog_or_tty); -- gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr); -+ gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr); - _failed = true; - } - return true; -@@ -5039,7 +5039,7 @@ void CMSCollector::checkpointRootsFinal( - - SpecializationStats::clear(); - if (PrintGCDetails) { -- gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]", -+ gclog_or_tty->print("[YG occupancy: " SIZE_FORMAT " K (" SIZE_FORMAT " K)]", - _young_gen->used() / K, - _young_gen->capacity() / K); - } -@@ -5172,8 +5172,8 @@ void CMSCollector::checkpointRootsFinalW - if (ser_ovflw > 0) { - if (PrintCMSStatistics != 0) { - gclog_or_tty->print_cr("Marking stack overflow (benign) " -- "(pmc_pc="SIZE_FORMAT", pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT -- ", kac_preclean="SIZE_FORMAT")", -+ "(pmc_pc=" SIZE_FORMAT ", pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT -+ ", kac_preclean=" SIZE_FORMAT ")", - _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw, - _ser_kac_ovflw, _ser_kac_preclean_ovflw); - } -@@ -5186,7 +5186,7 @@ void CMSCollector::checkpointRootsFinalW - if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) { - if (PrintCMSStatistics != 0) { - gclog_or_tty->print_cr("Work queue overflow (benign) " -- "(pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT")", -+ "(pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT ")", - _par_pmc_remark_ovflw, _par_kac_ovflw); - } - _par_pmc_remark_ovflw = 0; -@@ -5194,12 +5194,12 @@ void CMSCollector::checkpointRootsFinalW - } - if (PrintCMSStatistics != 0) { - if (_markStack._hit_limit > 0) { -- gclog_or_tty->print_cr(" (benign) Hit max stack size limit ("SIZE_FORMAT")", -+ gclog_or_tty->print_cr(" (benign) Hit max stack size limit (" SIZE_FORMAT ")", - _markStack._hit_limit); - } - if (_markStack._failed_double > 0) { -- gclog_or_tty->print_cr(" (benign) Failed stack doubling ("SIZE_FORMAT")," -- " current capacity "SIZE_FORMAT, -+ gclog_or_tty->print_cr(" (benign) Failed stack doubling (" SIZE_FORMAT ")," -+ " current capacity " SIZE_FORMAT, - _markStack._failed_double, - _markStack.capacity()); - } -@@ -5963,7 +5963,7 @@ void CMSCollector::do_remark_non_paralle - &markFromDirtyCardsClosure); - verify_work_stacks_empty(); - if (PrintCMSStatistics != 0) { -- gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in cms gen) ", -+ gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in cms gen) ", - markFromDirtyCardsClosure.num_dirty_cards()); - } - } -@@ -6893,7 +6893,7 @@ void CMSMarkStack::expand() { - } else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) { - // Failed to double capacity, continue; - // we print a detail message only once per CMS cycle. -- gclog_or_tty->print(" (benign) Failed to expand marking stack from "SIZE_FORMAT"K to " -+ gclog_or_tty->print(" (benign) Failed to expand marking stack from " SIZE_FORMAT "K to " - SIZE_FORMAT"K", - _capacity / K, new_capacity / K); - } -@@ -8216,25 +8216,25 @@ SweepClosure::~SweepClosure() { - ShouldNotReachHere(); - } - if (Verbose && PrintGC) { -- gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes", -+ gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes", - _numObjectsFreed, _numWordsFreed*sizeof(HeapWord)); -- gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, " -+ gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, " - SIZE_FORMAT" bytes " -- "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes", -+ "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes", - _numObjectsLive, _numWordsLive*sizeof(HeapWord), - _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord)); - size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree) - * sizeof(HeapWord); -- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes); -+ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes); - - if (PrintCMSStatistics && CMSVerifyReturnedBytes) { - size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes(); - size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes(); - size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes; -- gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes); -- gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes", -+ gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes); -+ gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes", - indexListReturnedBytes); -- gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes", -+ gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes", - dict_returned_bytes); - } - } -@@ -8313,13 +8313,13 @@ size_t SweepClosure::do_blk_careful(Heap - // coalesced chunk to the appropriate free list. - if (inFreeRange()) { - assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit, -- err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger())); -+ err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger())); - flush_cur_free_chunk(freeFinger(), - pointer_delta(addr, freeFinger())); - if (CMSTraceSweeper) { - gclog_or_tty->print("Sweep: last chunk: "); -- gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") " -- "[coalesced:"SIZE_FORMAT"]\n", -+ gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") " -+ "[coalesced:" SIZE_FORMAT "]\n", - freeFinger(), pointer_delta(addr, freeFinger()), - lastFreeRangeCoalesced()); - } ---- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp -@@ -92,7 +92,7 @@ public: - regions_at_put(_curr_index, NULL); - assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes, - err_msg("remaining reclaimable bytes inconsistent " -- "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT, -+ "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT, - hr->reclaimable_bytes(), _remaining_reclaimable_bytes)); - _remaining_reclaimable_bytes -= hr->reclaimable_bytes(); - _curr_index += 1; ---- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp -@@ -284,7 +284,7 @@ void CMMarkStack::expand() { - if (PrintGCDetails && Verbose) { - // Failed to double capacity, continue; - gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from " -- SIZE_FORMAT"K to " SIZE_FORMAT"K", -+ SIZE_FORMAT "K to " SIZE_FORMAT "K", - _capacity / K, new_capacity / K); - } - } -@@ -581,7 +581,7 @@ ConcurrentMark::ConcurrentMark(G1Collect - _verbose_level = verbose_level; - - if (verbose_low()) { -- gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", " -+ gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", " - "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end)); - } - -@@ -837,7 +837,7 @@ void ConcurrentMark::set_concurrency_and - // in a STW phase. - assert(!concurrent_marking_in_progress(), "invariant"); - assert(out_of_regions(), -- err_msg("only way to get here: _finger: "PTR_FORMAT", _heap_end: "PTR_FORMAT, -+ err_msg("only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT, - p2i(_finger), p2i(_heap_end))); - } - } -@@ -1452,7 +1452,7 @@ public: - - assert(start <= hr->end() && start <= ntams && ntams <= hr->end(), - err_msg("Preconditions not met - " -- "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT, -+ "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT, - p2i(start), p2i(ntams), p2i(hr->end()))); - - // Find the first marked object at or after "start". -@@ -1769,10 +1769,10 @@ class FinalCountDataUpdateClosure: publi - } - - assert(end_idx <= _card_bm->size(), -- err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, -+ err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, - end_idx, _card_bm->size())); - assert(start_idx < _card_bm->size(), -- err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, -+ err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, - start_idx, _card_bm->size())); - - _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); -@@ -2277,7 +2277,7 @@ class G1CMKeepAliveAndDrainClosure: publ - oop obj = oopDesc::load_decode_heap_oop(p); - if (_cm->verbose_high()) { - gclog_or_tty->print_cr("\t[%u] we're looking at location " -- "*"PTR_FORMAT" = "PTR_FORMAT, -+ "*" PTR_FORMAT " = " PTR_FORMAT, - _task->worker_id(), p2i(p), p2i((void*) obj)); - } - -@@ -2846,7 +2846,7 @@ public: - } - } - -- _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s", -+ _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s", - p2i(p), p2i((void*) obj), str, str2); - } - }; -@@ -2873,7 +2873,7 @@ public: - bool print_it = _all || over_tams || marked; - - if (print_it) { -- _out->print_cr(" "PTR_FORMAT"%s", -+ _out->print_cr(" " PTR_FORMAT "%s", - p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : ""); - PrintReachableOopClosure oopCl(_out, _vo, _all); - o->oop_iterate_no_header(&oopCl); -@@ -2894,7 +2894,7 @@ public: - HeapWord* e = hr->end(); - HeapWord* t = hr->top(); - HeapWord* p = _g1h->top_at_mark_start(hr, _vo); -- _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" " -+ _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " " - "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p)); - _out->cr(); - -@@ -3018,9 +3018,9 @@ ConcurrentMark::claim_region(uint worker - HeapWord* limit = curr_region->next_top_at_mark_start(); - - if (verbose_low()) { -- gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" " -- "["PTR_FORMAT", "PTR_FORMAT"), " -- "limit = "PTR_FORMAT, -+ gclog_or_tty->print_cr("[%u] curr_region = " PTR_FORMAT " " -+ "[" PTR_FORMAT ", " PTR_FORMAT "), " -+ "limit = " PTR_FORMAT, - worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit)); - } - -@@ -3035,7 +3035,7 @@ ConcurrentMark::claim_region(uint worker - - if (limit > bottom) { - if (verbose_low()) { -- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, " -+ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is not empty, " - "returning it ", worker_id, p2i(curr_region)); - } - return curr_region; -@@ -3043,7 +3043,7 @@ ConcurrentMark::claim_region(uint worker - assert(limit == bottom, - "the region limit should be at bottom"); - if (verbose_low()) { -- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, " -+ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is empty, " - "returning NULL", worker_id, p2i(curr_region)); - } - // we return NULL and the caller should try calling -@@ -3055,13 +3055,13 @@ ConcurrentMark::claim_region(uint worker - if (verbose_low()) { - if (curr_region == NULL) { - gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, " -- "global finger = "PTR_FORMAT", " -- "our finger = "PTR_FORMAT, -+ "global finger = " PTR_FORMAT ", " -+ "our finger = " PTR_FORMAT, - worker_id, p2i(_finger), p2i(finger)); - } else { - gclog_or_tty->print_cr("[%u] somebody else moved the finger, " -- "global finger = "PTR_FORMAT", " -- "our finger = "PTR_FORMAT, -+ "global finger = " PTR_FORMAT ", " -+ "our finger = " PTR_FORMAT, - worker_id, p2i(_finger), p2i(finger)); - } - } -@@ -3097,7 +3097,7 @@ private: - - void do_object_work(oop obj) { - guarantee(!_g1h->obj_in_cs(obj), -- err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d", -+ err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d", - p2i((void*) obj), phase_str(), _info)); - } - -@@ -3158,7 +3158,7 @@ void ConcurrentMark::verify_no_cset_oops - // here. - HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger); - guarantee(global_hr == NULL || global_finger == global_hr->bottom(), -- err_msg("global finger: "PTR_FORMAT" region: "HR_FORMAT, -+ err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT, - p2i(global_finger), HR_FORMAT_PARAMS(global_hr))); - } - -@@ -3172,7 +3172,7 @@ void ConcurrentMark::verify_no_cset_oops - HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger); - guarantee(task_hr == NULL || task_finger == task_hr->bottom() || - !task_hr->in_collection_set(), -- err_msg("task finger: "PTR_FORMAT" region: "HR_FORMAT, -+ err_msg("task finger: " PTR_FORMAT " region: " HR_FORMAT, - p2i(task_finger), HR_FORMAT_PARAMS(task_hr))); - } - } -@@ -3214,8 +3214,8 @@ class AggregateCountDataHRClosure: publi - - assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(), - err_msg("Preconditions not met - " -- "start: "PTR_FORMAT", limit: "PTR_FORMAT", " -- "top: "PTR_FORMAT", end: "PTR_FORMAT, -+ "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", " -+ "top: " PTR_FORMAT ", end: " PTR_FORMAT, - p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end()))); - - assert(hr->next_marked_bytes() == 0, "Precondition"); -@@ -3494,7 +3494,7 @@ bool ConcurrentMark::do_yield_check(uint - #ifndef PRODUCT - // for debugging purposes - void ConcurrentMark::print_finger() { -- gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT, -+ gclog_or_tty->print_cr("heap [" PTR_FORMAT ", " PTR_FORMAT "), global finger = " PTR_FORMAT, - p2i(_heap_start), p2i(_heap_end), p2i(_finger)); - for (uint i = 0; i < _max_worker_id; ++i) { - gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger())); -@@ -3579,7 +3579,7 @@ void CMTask::setup_for_region(HeapRegion - "claim_region() should have filtered out continues humongous regions"); - - if (_cm->verbose_low()) { -- gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT, -+ gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT, - _worker_id, p2i(hr)); - } - -@@ -3596,7 +3596,7 @@ void CMTask::update_region_limit() { - if (limit == bottom) { - if (_cm->verbose_low()) { - gclog_or_tty->print_cr("[%u] found an empty region " -- "["PTR_FORMAT", "PTR_FORMAT")", -+ "[" PTR_FORMAT ", " PTR_FORMAT ")", - _worker_id, p2i(bottom), p2i(limit)); - } - // The region was collected underneath our feet. -@@ -3628,7 +3628,7 @@ void CMTask::update_region_limit() { - void CMTask::giveup_current_region() { - assert(_curr_region != NULL, "invariant"); - if (_cm->verbose_low()) { -- gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT, -+ gclog_or_tty->print_cr("[%u] giving up region " PTR_FORMAT, - _worker_id, p2i(_curr_region)); - } - clear_region_fields(); -@@ -3750,7 +3750,7 @@ void CMTask::regular_clock_call() { - - if (_cm->verbose_medium()) { - gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, " -- "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s", -+ "scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s", - _worker_id, last_interval_ms, - _words_scanned, - (_words_scanned >= _words_scanned_limit) ? " (*)" : "", -@@ -3919,7 +3919,7 @@ void CMTask::drain_local_queue(bool part - statsOnly( ++_local_pops ); - - if (_cm->verbose_high()) { -- gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id, -+ gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id, - p2i((void*) obj)); - } - -@@ -4272,8 +4272,8 @@ void CMTask::do_marking_step(double time - - if (_cm->verbose_low()) { - gclog_or_tty->print_cr("[%u] we're scanning part " -- "["PTR_FORMAT", "PTR_FORMAT") " -- "of region "HR_FORMAT, -+ "[" PTR_FORMAT ", " PTR_FORMAT ") " -+ "of region " HR_FORMAT, - _worker_id, p2i(_finger), p2i(_region_limit), - HR_FORMAT_PARAMS(_curr_region)); - } -@@ -4360,7 +4360,7 @@ void CMTask::do_marking_step(double time - - if (_cm->verbose_low()) { - gclog_or_tty->print_cr("[%u] we successfully claimed " -- "region "PTR_FORMAT, -+ "region " PTR_FORMAT, - _worker_id, p2i(claimed_region)); - } - -@@ -4421,7 +4421,7 @@ void CMTask::do_marking_step(double time - - if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) { - if (_cm->verbose_medium()) { -- gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully", -+ gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully", - _worker_id, p2i((void*) obj)); - } - -@@ -4629,7 +4629,7 @@ CMTask::CMTask(uint worker_id, - // identify them easily in a large log file. - #define G1PPRL_LINE_PREFIX "###" - --#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT -+#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT - #ifdef _LP64 - #define G1PPRL_ADDR_BASE_H_FORMAT " %37s" - #else // _LP64 -@@ -4639,16 +4639,16 @@ CMTask::CMTask(uint worker_id, - // For per-region info - #define G1PPRL_TYPE_FORMAT " %-4s" - #define G1PPRL_TYPE_H_FORMAT " %4s" --#define G1PPRL_BYTE_FORMAT " "SIZE_FORMAT_W(9) -+#define G1PPRL_BYTE_FORMAT " " SIZE_FORMAT_W(9) - #define G1PPRL_BYTE_H_FORMAT " %9s" - #define G1PPRL_DOUBLE_FORMAT " %14.1f" - #define G1PPRL_DOUBLE_H_FORMAT " %14s" - - // For summary info --#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT --#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT --#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB" --#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%" -+#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":" G1PPRL_ADDR_BASE_FORMAT -+#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT -+#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB" -+#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%" - - G1PrintRegionLivenessInfoClosure:: - G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name) ---- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp -@@ -196,8 +196,8 @@ inline bool CMBitMapRO::iterate(BitMapCl - assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \ - "outside underlying space?"); \ - assert(G1CollectedHeap::heap()->is_in_exact(addr), \ -- err_msg("Trying to access not available bitmap "PTR_FORMAT \ -- " corresponding to "PTR_FORMAT" (%u)", \ -+ err_msg("Trying to access not available bitmap " PTR_FORMAT \ -+ " corresponding to " PTR_FORMAT " (%u)", \ - p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr))); - - inline void CMBitMap::mark(HeapWord* addr) { -@@ -343,7 +343,7 @@ inline void CMTask::make_reference_grey( - - inline void CMTask::deal_with_reference(oop obj) { - if (_cm->verbose_high()) { -- gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT, -+ gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT, - _worker_id, p2i((void*) obj)); - } - -@@ -392,7 +392,7 @@ inline void ConcurrentMark::grayRoot(oop - // assert that word_size is under an upper bound which is its - // containing region's capacity. - assert(word_size * HeapWordSize <= hr->capacity(), -- err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT, -+ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT, - word_size * HeapWordSize, hr->capacity(), - HR_FORMAT_PARAMS(hr))); - ---- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp -@@ -140,7 +140,7 @@ HeapWord* G1AllocRegion::new_alloc_regio - } - - void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) { -- msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT, -+ msg->append("[%s] %s c: %u b: %s r: " PTR_FORMAT " u: " SIZE_FORMAT, - _name, message, _count, BOOL_TO_STR(_bot_updates), - p2i(_alloc_region), _used_bytes_before); - } -@@ -217,7 +217,7 @@ void G1AllocRegion::trace(const char* st - - if (G1_ALLOC_REGION_TRACING > 1) { - if (result != NULL) { -- jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT" "PTR_FORMAT, -+ jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT " " PTR_FORMAT, - word_size, result); - } else if (word_size != 0) { - jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size); ---- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp -@@ -73,7 +73,7 @@ public: - - void decrease_used(size_t bytes) { - assert(_summary_bytes_used >= bytes, -- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT, -+ err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT, - _summary_bytes_used, bytes)); - _summary_bytes_used -= bytes; - } ---- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp -@@ -385,11 +385,11 @@ G1BlockOffsetArray::verify_for_object(He - HeapWord* card_addr = _array->address_for_index(card); - HeapWord* block_start = block_start_const(card_addr); - if (block_start != obj_start) { -- gclog_or_tty->print_cr("block start: "PTR_FORMAT" is incorrect - " -- "card index: "SIZE_FORMAT" " -- "card addr: "PTR_FORMAT" BOT entry: %u " -- "obj: "PTR_FORMAT" word size: "SIZE_FORMAT" " -- "cards: ["SIZE_FORMAT","SIZE_FORMAT"]", -+ gclog_or_tty->print_cr("block start: " PTR_FORMAT " is incorrect - " -+ "card index: " SIZE_FORMAT " " -+ "card addr: " PTR_FORMAT " BOT entry: %u " -+ "obj: " PTR_FORMAT " word size: " SIZE_FORMAT " " -+ "cards: [" SIZE_FORMAT "," SIZE_FORMAT "]", - block_start, card, card_addr, - _array->offset_array(card), - obj_start, word_size, first_card, last_card); -@@ -404,11 +404,11 @@ void - G1BlockOffsetArray::print_on(outputStream* out) { - size_t from_index = _array->index_for(_bottom); - size_t to_index = _array->index_for(_end); -- out->print_cr(">> BOT for area ["PTR_FORMAT","PTR_FORMAT") " -- "cards ["SIZE_FORMAT","SIZE_FORMAT")", -+ out->print_cr(">> BOT for area [" PTR_FORMAT "," PTR_FORMAT ") " -+ "cards [" SIZE_FORMAT "," SIZE_FORMAT ")", - _bottom, _end, from_index, to_index); - for (size_t i = from_index; i < to_index; ++i) { -- out->print_cr(" entry "SIZE_FORMAT_W(8)" | "PTR_FORMAT" : %3u", -+ out->print_cr(" entry " SIZE_FORMAT_W(8) " | " PTR_FORMAT " : %3u", - i, _array->address_for_index(i), - (uint) _array->offset_array(i)); - } -@@ -488,7 +488,7 @@ G1BlockOffsetArrayContigSpace::set_for_s - void - G1BlockOffsetArrayContigSpace::print_on(outputStream* out) { - G1BlockOffsetArray::print_on(out); -- out->print_cr(" next offset threshold: "PTR_FORMAT, _next_offset_threshold); -- out->print_cr(" next offset index: "SIZE_FORMAT, _next_offset_index); -+ out->print_cr(" next offset threshold: " PTR_FORMAT, _next_offset_threshold); -+ out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index); - } - #endif // !PRODUCT ---- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp -@@ -47,15 +47,15 @@ G1BlockOffsetTable::block_start_const(co - } - } - --#define check_index(index, msg) \ -- assert((index) < (_reserved.word_size() >> LogN_words), \ -- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \ -- msg, (index), (_reserved.word_size() >> LogN_words))); \ -- assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \ -- err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \ -- " (%u) is not in committed area.", \ -- (index), \ -- p2i(address_for_index_raw(index)), \ -+#define check_index(index, msg) \ -+ assert((index) < (_reserved.word_size() >> LogN_words), \ -+ err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \ -+ msg, (index), (_reserved.word_size() >> LogN_words))); \ -+ assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \ -+ err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \ -+ " (%u) is not in committed area.", \ -+ (index), \ -+ p2i(address_for_index_raw(index)), \ - G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index)))); - - u_char G1BlockOffsetSharedArray::offset_array(size_t index) const { ---- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp -@@ -44,7 +44,7 @@ void G1CardCountsMappingChangedListener: - void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { - if (has_count_table()) { - assert(from_card_num < to_card_num, -- err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT, -+ err_msg("Wrong order? from: " SIZE_FORMAT ", to: " SIZE_FORMAT, - from_card_num, to_card_num)); - Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num)); - } -@@ -87,7 +87,7 @@ uint G1CardCounts::add_card_count(jbyte* - if (has_count_table()) { - size_t card_num = ptr_2_card_num(card_ptr); - assert(card_num < _reserved_max_card_num, -- err_msg("Card "SIZE_FORMAT" outside of card counts table (max size "SIZE_FORMAT")", -+ err_msg("Card " SIZE_FORMAT " outside of card counts table (max size " SIZE_FORMAT ")", - card_num, _reserved_max_card_num)); - count = (uint) _card_counts[card_num]; - if (count < G1ConcRSHotCardLimit) { ---- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp -@@ -91,7 +91,7 @@ class G1CardCounts: public CHeapObj<mtGC - - jbyte* card_num_2_ptr(size_t card_num) { - assert(card_num >= 0 && card_num < _reserved_max_card_num, -- err_msg("card num out of range: "SIZE_FORMAT, card_num)); -+ err_msg("card num out of range: " SIZE_FORMAT, card_num)); - return (jbyte*) (_ct_bot + card_num); - } - ---- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp -@@ -230,7 +230,7 @@ bool YoungList::check_list_well_formed() - HeapRegion* last = NULL; - while (curr != NULL) { - if (!curr->is_young()) { -- gclog_or_tty->print_cr("### YOUNG REGION "PTR_FORMAT"-"PTR_FORMAT" " -+ gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " " - "incorrectly tagged (y: %d, surv: %d)", - curr->bottom(), curr->end(), - curr->is_young(), curr->is_survivor()); -@@ -359,7 +359,7 @@ void YoungList::print() { - if (curr == NULL) - gclog_or_tty->print_cr(" empty"); - while (curr != NULL) { -- gclog_or_tty->print_cr(" "HR_FORMAT", P: "PTR_FORMAT ", N: "PTR_FORMAT", age: %4d", -+ gclog_or_tty->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d", - HR_FORMAT_PARAMS(curr), - curr->prev_top_at_mark_start(), - curr->next_top_at_mark_start(), -@@ -490,7 +490,7 @@ void G1CollectedHeap::check_ct_logs_at_s - gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.", - clear.num_processed(), orig_count); - guarantee(redirty.num_processed() == clear.num_processed(), -- err_msg("Redirtied "SIZE_FORMAT" cards, bug cleared "SIZE_FORMAT, -+ err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT, - redirty.num_processed(), clear.num_processed())); - - CountNonCleanMemRegionClosure count3(this); -@@ -528,7 +528,7 @@ G1CollectedHeap::new_region_try_secondar - HeapRegion* res = _hrm.allocate_free_region(is_old); - if (G1ConcRegionFreeingVerbose) { - gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : " -- "allocated "HR_FORMAT" from secondary_free_list", -+ "allocated " HR_FORMAT " from secondary_free_list", - HR_FORMAT_PARAMS(res)); - } - return res; -@@ -1597,8 +1597,8 @@ resize_if_necessary_after_full_collectio - // This assert only makes sense here, before we adjust them - // with respect to the min and max heap size. - assert(minimum_desired_capacity <= maximum_desired_capacity, -- err_msg("minimum_desired_capacity = "SIZE_FORMAT", " -- "maximum_desired_capacity = "SIZE_FORMAT, -+ err_msg("minimum_desired_capacity = " SIZE_FORMAT ", " -+ "maximum_desired_capacity = " SIZE_FORMAT, - minimum_desired_capacity, maximum_desired_capacity)); - - // Should not be greater than the heap max size. No need to adjust -@@ -2256,7 +2256,7 @@ public: - virtual bool doHeapRegion(HeapRegion* hr) { - unsigned region_gc_time_stamp = hr->get_gc_time_stamp(); - if (_gc_time_stamp != region_gc_time_stamp) { -- gclog_or_tty->print_cr("Region "HR_FORMAT" has GC time stamp = %d, " -+ gclog_or_tty->print_cr("Region " HR_FORMAT " has GC time stamp = %d, " - "expected %d", HR_FORMAT_PARAMS(hr), - region_gc_time_stamp, _gc_time_stamp); - _failures = true; -@@ -2679,7 +2679,7 @@ public: - } else if (r->continuesHumongous()) { - if (r->humongous_start_region() != _sh_region) { - gclog_or_tty->print_cr("Region " HR_FORMAT ", " -- "HS = "PTR_FORMAT", should be "PTR_FORMAT, -+ "HS = " PTR_FORMAT ", should be " PTR_FORMAT, - HR_FORMAT_PARAMS(r), - r->humongous_start_region(), - _sh_region); -@@ -2991,10 +2991,10 @@ public: - if (!oopDesc::is_null(heap_oop)) { - oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); - if (_g1h->is_obj_dead_cond(obj, _vo)) { -- gclog_or_tty->print_cr("Root location "PTR_FORMAT" " -- "points to dead obj "PTR_FORMAT, p, (void*) obj); -+ gclog_or_tty->print_cr("Root location " PTR_FORMAT " " -+ "points to dead obj " PTR_FORMAT, p, (void*) obj); - if (_vo == VerifyOption_G1UseMarkWord) { -- gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark())); -+ gclog_or_tty->print_cr(" Mark word: " PTR_FORMAT, (void*)(obj->mark())); - } - obj->print_on(gclog_or_tty); - _failures = true; -@@ -3041,9 +3041,9 @@ class G1VerifyCodeRootOopClosure: public - // Verify that the strong code root list for this region - // contains the nmethod - if (!hrrs->strong_code_roots_list_contains(_nm)) { -- gclog_or_tty->print_cr("Code root location "PTR_FORMAT" " -- "from nmethod "PTR_FORMAT" not in strong " -- "code roots for region ["PTR_FORMAT","PTR_FORMAT")", -+ gclog_or_tty->print_cr("Code root location " PTR_FORMAT " " -+ "from nmethod " PTR_FORMAT " not in strong " -+ "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")", - p, _nm, hr->bottom(), hr->end()); - _failures = true; - } -@@ -3173,7 +3173,7 @@ public: - if (o != NULL) { - HeapWord *start = (HeapWord *) o; - size_t word_sz = o->size(); -- gclog_or_tty->print("\nPrinting obj "PTR_FORMAT" of size " SIZE_FORMAT -+ gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT - " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n", - (void*) o, word_sz, - _g1->isMarkedPrev(o), -@@ -3184,7 +3184,7 @@ public: - int *val; - for (cur = start; cur < end; cur++) { - val = (int *) cur; -- gclog_or_tty->print("\t "PTR_FORMAT":"PTR_FORMAT"\n", val, *val); -+ gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val); - } - } - } -@@ -3219,9 +3219,9 @@ public: - r->object_iterate(¬_dead_yet_cl); - if (_vo != VerifyOption_G1UseNextMarking) { - if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) { -- gclog_or_tty->print_cr("["PTR_FORMAT","PTR_FORMAT"] " -- "max_live_bytes "SIZE_FORMAT" " -- "< calculated "SIZE_FORMAT, -+ gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] " -+ "max_live_bytes " SIZE_FORMAT " " -+ "< calculated " SIZE_FORMAT, - r->bottom(), r->end(), - r->max_live_bytes(), - not_dead_yet_cl.live_bytes()); -@@ -3533,7 +3533,7 @@ public: - size_t occupied = hrrs->occupied(); - _occupied_sum += occupied; - -- gclog_or_tty->print_cr("Printing RSet for region "HR_FORMAT, -+ gclog_or_tty->print_cr("Printing RSet for region " HR_FORMAT, - HR_FORMAT_PARAMS(r)); - if (occupied == 0) { - gclog_or_tty->print_cr(" RSet is empty"); -@@ -3552,7 +3552,7 @@ public: - } - - ~PrintRSetsClosure() { -- gclog_or_tty->print_cr("Occupied Sum: "SIZE_FORMAT, _occupied_sum); -+ gclog_or_tty->print_cr("Occupied Sum: " SIZE_FORMAT, _occupied_sum); - gclog_or_tty->print_cr("========================================"); - gclog_or_tty->cr(); - } -@@ -4416,7 +4416,7 @@ oop - G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state, - oop old) { - assert(obj_in_cs(old), -- err_msg("obj: "PTR_FORMAT" should still be in the CSet", -+ err_msg("obj: " PTR_FORMAT " should still be in the CSet", - (HeapWord*) old)); - markOop m = old->mark(); - oop forward_ptr = old->forward_to_atomic(old); -@@ -4450,7 +4450,7 @@ G1CollectedHeap::handle_evacuation_failu - // space for this object (old != forward_ptr) or they beat us in - // self-forwarding it (old == forward_ptr). - assert(old == forward_ptr || !obj_in_cs(forward_ptr), -- err_msg("obj: "PTR_FORMAT" forwarded to: "PTR_FORMAT" " -+ err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " " - "should not be in the CSet", - (HeapWord*) old, (HeapWord*) forward_ptr)); - return forward_ptr; -@@ -4837,16 +4837,16 @@ public: - - ~G1StringSymbolTableUnlinkTask() { - guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size, -- err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT, -+ err_msg("claim value " INT32_FORMAT " after unlink less than initial string table size " INT32_FORMAT, - StringTable::parallel_claimed_index(), _initial_string_table_size)); - guarantee(!_process_symbols || !_do_in_parallel || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size, -- err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT, -+ err_msg("claim value " INT32_FORMAT " after unlink less than initial symbol table size " INT32_FORMAT, - SymbolTable::parallel_claimed_index(), _initial_symbol_table_size)); - - if (G1TraceStringSymbolTableScrubbing) { - gclog_or_tty->print_cr("Cleaned string and symbol table, " -- "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, " -- "symbols: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed", -+ "strings: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed, " -+ "symbols: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed", - strings_processed(), strings_removed(), - symbols_processed(), symbols_removed()); - } -@@ -6029,13 +6029,13 @@ void G1CollectedHeap::verify_dirty_young - bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap, - HeapWord* tams, HeapWord* end) { - guarantee(tams <= end, -- err_msg("tams: "PTR_FORMAT" end: "PTR_FORMAT, tams, end)); -+ err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end)); - HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end); - if (result < end) { - gclog_or_tty->cr(); -- gclog_or_tty->print_cr("## wrong marked address on %s bitmap: "PTR_FORMAT, -+ gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT, - bitmap_name, result); -- gclog_or_tty->print_cr("## %s tams: "PTR_FORMAT" end: "PTR_FORMAT, -+ gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT, - bitmap_name, tams, end); - return false; - } -@@ -6061,7 +6061,7 @@ bool G1CollectedHeap::verify_bitmaps(con - res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end); - } - if (!res_p || !res_n) { -- gclog_or_tty->print_cr("#### Bitmap verification failed for "HR_FORMAT, -+ gclog_or_tty->print_cr("#### Bitmap verification failed for " HR_FORMAT, - HR_FORMAT_PARAMS(hr)); - gclog_or_tty->print_cr("#### Caller: %s", caller); - return false; -@@ -6373,7 +6373,7 @@ class G1FreeHumongousRegionClosure : pub - !r->rem_set()->is_empty()) { - - if (G1TraceEagerReclaimHumongousObjects) { -- 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", -+ 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", - region_idx, - obj->size()*HeapWordSize, - r->bottom(), -@@ -6395,7 +6395,7 @@ class G1FreeHumongousRegionClosure : pub - r->bottom())); - - if (G1TraceEagerReclaimHumongousObjects) { -- 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", -+ 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", - region_idx, - obj->size()*HeapWordSize, - r->bottom(), -@@ -6551,7 +6551,7 @@ public: - NoYoungRegionsClosure() : _success(true) { } - bool doHeapRegion(HeapRegion* r) { - if (r->is_young()) { -- gclog_or_tty->print_cr("Region ["PTR_FORMAT", "PTR_FORMAT") tagged as young", -+ gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young", - r->bottom(), r->end()); - _success = false; - } -@@ -6680,7 +6680,7 @@ void G1CollectedHeap::rebuild_region_set - } - assert(_allocator->used_unlocked() == recalculate_used(), - err_msg("inconsistent _allocator->used_unlocked(), " -- "value: "SIZE_FORMAT" recalculated: "SIZE_FORMAT, -+ "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT, - _allocator->used_unlocked(), recalculate_used())); - } - -@@ -6901,8 +6901,8 @@ class RegisterNMethodOopClosure: public - oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); - HeapRegion* hr = _g1h->heap_region_containing(obj); - assert(!hr->continuesHumongous(), -- err_msg("trying to add code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT -- " starting at "HR_FORMAT, -+ err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT -+ " starting at " HR_FORMAT, - _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); - - // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries. -@@ -6928,8 +6928,8 @@ class UnregisterNMethodOopClosure: publi - oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); - HeapRegion* hr = _g1h->heap_region_containing(obj); - assert(!hr->continuesHumongous(), -- err_msg("trying to remove code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT -- " starting at "HR_FORMAT, -+ err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT -+ " starting at " HR_FORMAT, - _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); - - hr->remove_strong_code_root(_nm); ---- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp -@@ -81,7 +81,7 @@ inline HeapRegion* G1CollectedHeap::regi - - inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const { - assert(is_in_reserved(addr), -- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")", -+ err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")", - p2i(addr), p2i(_reserved.start()), p2i(_reserved.end()))); - return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes); - } -@@ -94,7 +94,7 @@ template <class T> - inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const { - assert(addr != NULL, "invariant"); - assert(is_in_g1_reserved((const void*) addr), -- err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")", -+ err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")", - p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end()))); - return _hrm.addr_to_region((HeapWord*) addr); - } ---- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp -@@ -199,7 +199,7 @@ G1CollectorPolicy::G1CollectorPolicy() : - const size_t region_size = HeapRegion::GrainWords; - if (YoungPLABSize > region_size || OldPLABSize > region_size) { - char buffer[128]; -- jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT, -+ jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT, - OldPLABSize > region_size ? "Old" : "Young", region_size); - vm_exit_during_initialization(buffer); - } -@@ -846,7 +846,7 @@ void G1CollectorPolicy::record_collectio - update_survivors_policy(); - - assert(_g1->used() == _g1->recalculate_used(), -- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT, -+ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT, - _g1->used(), _g1->recalculate_used())); - - double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0; -@@ -1231,10 +1231,10 @@ void G1CollectorPolicy::print_detailed_h - (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc; - - gclog_or_tty->print( -- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") " -- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" " -- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->" -- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]", -+ " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") " -+ "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " " -+ "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" -+ EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]", - EXT_SIZE_PARAMS(_eden_used_bytes_before_gc), - EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc), - EXT_SIZE_PARAMS(eden_used_bytes_after_gc), -@@ -1851,7 +1851,7 @@ void G1CollectorPolicy::print_collection - while (csr != NULL) { - HeapRegion* next = csr->next_in_collection_set(); - assert(csr->in_collection_set(), "bad CS"); -- st->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d", -+ st->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d", - HR_FORMAT_PARAMS(csr), - csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(), - csr->age_in_surv_rate_group_cond()); ---- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp -@@ -121,15 +121,15 @@ public: - // Single parameter format strings - #define ergo_format_str(_name_) ", " _name_ ": %s" - #define ergo_format_region(_name_) ", " _name_ ": %u regions" --#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes" -+#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes" - #define ergo_format_double(_name_) ", " _name_ ": %1.2f" - #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%" - #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms" --#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT -+#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT - - // Double parameter format strings - #define ergo_format_byte_perc(_name_) \ -- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)" -+ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)" - - // Generates the format string - #define ergo_format(_extra_format_) \ ---- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp -@@ -332,7 +332,7 @@ void G1GCPhaseTimes::print_stats(int lev - } - - void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) { -- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value); -+ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value); - } - - void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) { -@@ -452,7 +452,7 @@ class G1GCParPhasePrinter : public Stack - - if (phase->_thread_work_items != NULL) { - LineBuffer buf2(phase->_thread_work_items->_indent_level); -- buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); -+ buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); - } - } - ---- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp -@@ -84,18 +84,18 @@ void G1HRPrinter::print(ActionType actio - - if (type_str != NULL) { - if (top != NULL) { -- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT, -+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT, - action_str, type_str, bottom, top); - } else { -- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT, -+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT, - action_str, type_str, bottom); - } - } else { - if (top != NULL) { -- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT, -+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT, - action_str, bottom, top); - } else { -- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT, -+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT, - action_str, bottom); - } - } -@@ -104,11 +104,11 @@ void G1HRPrinter::print(ActionType actio - void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) { - const char* action_str = action_name(action); - -- gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]", -+ gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]", - action_str, bottom, end); - } - - void G1HRPrinter::print(PhaseType phase, size_t phase_num) { - const char* phase_str = phase_name(phase); -- gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num); -+ gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num); - } ---- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp -@@ -118,7 +118,7 @@ inline void G1CMOopClosure::do_oop_nv(T* - oop obj = oopDesc::load_decode_heap_oop(p); - if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%u] we're looking at location " -- "*"PTR_FORMAT" = "PTR_FORMAT, -+ "*" PTR_FORMAT " = " PTR_FORMAT, - _task->worker_id(), p2i(p), p2i((void*) obj)); - } - _task->deal_with_reference(obj); ---- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp -@@ -442,7 +442,7 @@ G1UpdateRSOrPushRefOopClosure(G1Collecte - bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i, - bool check_for_refs_into_cset) { - assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)), -- err_msg("Card at "PTR_FORMAT" index "SIZE_FORMAT" representing heap at "PTR_FORMAT" (%u) must be in committed heap", -+ err_msg("Card at " PTR_FORMAT " index " SIZE_FORMAT " representing heap at " PTR_FORMAT " (%u) must be in committed heap", - p2i(card_ptr), - _ct_bs->index_for(_ct_bs->addr_for(card_ptr)), - _ct_bs->addr_for(card_ptr), ---- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp -@@ -344,16 +344,16 @@ public: - - void G1RemSetSummary::print_on(outputStream* out) { - out->print_cr("\n Recent concurrent refinement statistics"); -- out->print_cr(" Processed "SIZE_FORMAT" cards", -+ out->print_cr(" Processed " SIZE_FORMAT " cards", - num_concurrent_refined_cards()); -- out->print_cr(" Of "SIZE_FORMAT" completed buffers:", num_processed_buf_total()); -- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by concurrent RS threads.", -+ out->print_cr(" Of " SIZE_FORMAT " completed buffers:", num_processed_buf_total()); -+ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by concurrent RS threads.", - num_processed_buf_total(), - percent_of(num_processed_buf_rs_threads(), num_processed_buf_total())); -- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by mutator threads.", -+ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by mutator threads.", - num_processed_buf_mutator(), - percent_of(num_processed_buf_mutator(), num_processed_buf_total())); -- out->print_cr(" Did "SIZE_FORMAT" coarsenings.", num_coarsenings()); -+ out->print_cr(" Did " SIZE_FORMAT " coarsenings.", num_coarsenings()); - out->print_cr(" Concurrent RS threads times (s)"); - out->print(" "); - for (uint i = 0; i < _num_vtimes; i++) { ---- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp -@@ -151,7 +151,7 @@ void G1StringDedupQueue::unlink_or_oops_ - void G1StringDedupQueue::print_statistics(outputStream* st) { - st->print_cr( - " [Queue]\n" -- " [Dropped: "UINTX_FORMAT"]", _queue->_dropped); -+ " [Dropped: " UINTX_FORMAT "]", _queue->_dropped); - } - - void G1StringDedupQueue::verify() { ---- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp -@@ -80,8 +80,8 @@ void G1StringDedupStat::print_summary(ou - st->stamp(PrintGCTimeStamps); - st->print_cr( - "[GC concurrent-string-deduplication, " -- G1_STRDEDUP_BYTES_FORMAT_NS"->"G1_STRDEDUP_BYTES_FORMAT_NS"("G1_STRDEDUP_BYTES_FORMAT_NS"), avg " -- G1_STRDEDUP_PERCENT_FORMAT_NS", "G1_STRDEDUP_TIME_FORMAT"]", -+ G1_STRDEDUP_BYTES_FORMAT_NS "->" G1_STRDEDUP_BYTES_FORMAT_NS "(" G1_STRDEDUP_BYTES_FORMAT_NS "), avg " -+ G1_STRDEDUP_PERCENT_FORMAT_NS ", " G1_STRDEDUP_TIME_FORMAT "]", - G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes), - G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes), - G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes), -@@ -135,22 +135,22 @@ void G1StringDedupStat::print_statistics - - if (total) { - st->print_cr( -- " [Total Exec: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Idle: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", -+ " [Total Exec: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Idle: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]", - stat._exec, stat._exec_elapsed, stat._idle, stat._idle_elapsed, stat._block, stat._block_elapsed); - } else { - st->print_cr( -- " [Last Exec: "G1_STRDEDUP_TIME_FORMAT", Idle: "G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", -+ " [Last Exec: " G1_STRDEDUP_TIME_FORMAT ", Idle: " G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]", - stat._exec_elapsed, stat._idle_elapsed, stat._block, stat._block_elapsed); - } - st->print_cr( -- " [Inspected: "G1_STRDEDUP_OBJECTS_FORMAT"]\n" -- " [Skipped: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" -- " [Hashed: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" -- " [Known: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" -- " [New: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"]\n" -- " [Deduplicated: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" -- " [Young: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" -- " [Old: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]", -+ " [Inspected: " G1_STRDEDUP_OBJECTS_FORMAT "]\n" -+ " [Skipped: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" -+ " [Hashed: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" -+ " [Known: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" -+ " [New: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "]\n" -+ " [Deduplicated: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" -+ " [Young: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" -+ " [Old: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]", - stat._inspected, - stat._skipped, skipped_percent, - stat._hashed, hashed_percent, ---- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp -@@ -596,12 +596,12 @@ void G1StringDedupTable::clean_entry_cac - void G1StringDedupTable::print_statistics(outputStream* st) { - st->print_cr( - " [Table]\n" -- " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n" -- " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n" -- " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n" -- " [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n" -- " [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n" -- " [Age Threshold: "UINTX_FORMAT"]", -+ " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n" -+ " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n" -+ " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n" -+ " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n" -+ " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n" -+ " [Age Threshold: " UINTX_FORMAT "]", - G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)), - _table->_size, _min_size, _max_size, - _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed, ---- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp -@@ -333,7 +333,7 @@ void HeapRegion::note_self_forwarding_re - bool during_conc_mark, - size_t marked_bytes) { - assert(0 <= marked_bytes && marked_bytes <= used(), -- err_msg("marked: "SIZE_FORMAT" used: "SIZE_FORMAT, -+ err_msg("marked: " SIZE_FORMAT " used: " SIZE_FORMAT, - marked_bytes, used())); - _prev_top_at_mark_start = top(); - _prev_marked_bytes = marked_bytes; -@@ -514,9 +514,9 @@ class VerifyStrongCodeRootOopClosure: pu - // Object is in the region. Check that its less than top - if (_hr->top() <= (HeapWord*)obj) { - // Object is above top -- gclog_or_tty->print_cr("Object "PTR_FORMAT" in region " -- "["PTR_FORMAT", "PTR_FORMAT") is above " -- "top "PTR_FORMAT, -+ gclog_or_tty->print_cr("Object " PTR_FORMAT " in region " -+ "[" PTR_FORMAT ", " PTR_FORMAT ") is above " -+ "top " PTR_FORMAT, - (void *)obj, _hr->bottom(), _hr->end(), _hr->top()); - _failures = true; - return; -@@ -550,22 +550,22 @@ public: - if (nm != NULL) { - // Verify that the nemthod is live - if (!nm->is_alive()) { -- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod " -- PTR_FORMAT" in its strong code roots", -+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has dead nmethod " -+ PTR_FORMAT " in its strong code roots", - _hr->bottom(), _hr->end(), nm); - _failures = true; - } else { - VerifyStrongCodeRootOopClosure oop_cl(_hr, nm); - nm->oops_do(&oop_cl); - if (!oop_cl.has_oops_in_region()) { -- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod " -- PTR_FORMAT" in its strong code roots " -+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has nmethod " -+ PTR_FORMAT " in its strong code roots " - "with no pointers into region", - _hr->bottom(), _hr->end(), nm); - _failures = true; - } else if (oop_cl.failures()) { -- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other " -- "failures for nmethod "PTR_FORMAT, -+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has other " -+ "failures for nmethod " PTR_FORMAT, - _hr->bottom(), _hr->end(), nm); - _failures = true; - } -@@ -599,8 +599,8 @@ void HeapRegion::verify_strong_code_root - // on its strong code root list - if (is_empty()) { - if (strong_code_roots_length > 0) { -- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty " -- "but has "SIZE_FORMAT" code root entries", -+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is empty " -+ "but has " SIZE_FORMAT " code root entries", - bottom(), end(), strong_code_roots_length); - *failures = true; - } -@@ -609,8 +609,8 @@ void HeapRegion::verify_strong_code_root - - if (continuesHumongous()) { - if (strong_code_roots_length > 0) { -- gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous " -- "region but has "SIZE_FORMAT" code root entries", -+ gclog_or_tty->print_cr("region " HR_FORMAT " is a continuation of a humongous " -+ "region but has " SIZE_FORMAT " code root entries", - HR_FORMAT_PARAMS(this), strong_code_roots_length); - *failures = true; - } -@@ -634,7 +634,7 @@ void HeapRegion::print_on(outputStream* - else - st->print(" "); - st->print(" TS %5d", _gc_time_stamp); -- st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT, -+ st->print(" PTAMS " PTR_FORMAT " NTAMS " PTR_FORMAT, - prev_top_at_mark_start(), next_top_at_mark_start()); - G1OffsetTableContigSpace::print_on(st); - } -@@ -708,25 +708,25 @@ public: - } - if (!_g1h->is_in_closed_subset(obj)) { - HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); -- gclog_or_tty->print_cr("Field "PTR_FORMAT -- " of live obj "PTR_FORMAT" in region " -- "["PTR_FORMAT", "PTR_FORMAT")", -+ gclog_or_tty->print_cr("Field " PTR_FORMAT -+ " of live obj " PTR_FORMAT " in region " -+ "[" PTR_FORMAT ", " PTR_FORMAT ")", - p, (void*) _containing_obj, - from->bottom(), from->end()); - print_object(gclog_or_tty, _containing_obj); -- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap", -+ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " not in the heap", - (void*) obj); - } else { - HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); - HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj); -- gclog_or_tty->print_cr("Field "PTR_FORMAT -- " of live obj "PTR_FORMAT" in region " -- "["PTR_FORMAT", "PTR_FORMAT")", -+ gclog_or_tty->print_cr("Field " PTR_FORMAT -+ " of live obj " PTR_FORMAT " in region " -+ "[" PTR_FORMAT ", " PTR_FORMAT ")", - p, (void*) _containing_obj, - from->bottom(), from->end()); - print_object(gclog_or_tty, _containing_obj); -- gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region " -- "["PTR_FORMAT", "PTR_FORMAT")", -+ gclog_or_tty->print_cr("points to dead obj " PTR_FORMAT " in region " -+ "[" PTR_FORMAT ", " PTR_FORMAT ")", - (void*) obj, to->bottom(), to->end()); - print_object(gclog_or_tty, obj); - } -@@ -784,14 +784,14 @@ public: - gclog_or_tty->print_cr("----------"); - } - gclog_or_tty->print_cr("Missing rem set entry:"); -- gclog_or_tty->print_cr("Field "PTR_FORMAT" " -- "of obj "PTR_FORMAT", " -- "in region "HR_FORMAT, -+ gclog_or_tty->print_cr("Field " PTR_FORMAT " " -+ "of obj " PTR_FORMAT ", " -+ "in region " HR_FORMAT, - p, (void*) _containing_obj, - HR_FORMAT_PARAMS(from)); - _containing_obj->print_on(gclog_or_tty); -- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" " -- "in region "HR_FORMAT, -+ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " " -+ "in region " HR_FORMAT, - (void*) obj, - HR_FORMAT_PARAMS(to)); - if (obj->is_oop()) { -@@ -830,8 +830,8 @@ void HeapRegion::verify(VerifyOption vo, - - if (is_humongous != g1->isHumongous(obj_size) && - !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects. -- gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size (" -- SIZE_FORMAT" words) in a %shumongous region", -+ gclog_or_tty->print_cr("obj " PTR_FORMAT " is of %shumongous size (" -+ SIZE_FORMAT " words) in a %shumongous region", - p, g1->isHumongous(obj_size) ? "" : "non-", - obj_size, is_humongous ? "" : "non-"); - *failures = true; -@@ -854,12 +854,12 @@ void HeapRegion::verify(VerifyOption vo, - (vo == VerifyOption_G1UsePrevMarking && - ClassLoaderDataGraph::unload_list_contains(klass)); - if (!is_metaspace_object) { -- gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " -+ gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " " - "not metadata", klass, (void *)obj); - *failures = true; - return; - } else if (!klass->is_klass()) { -- gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " -+ gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " " - "not a klass", klass, (void *)obj); - *failures = true; - return; -@@ -891,7 +891,7 @@ void HeapRegion::verify(VerifyOption vo, - } - } - } else { -- gclog_or_tty->print_cr(PTR_FORMAT" not an oop", (void *)obj); -+ gclog_or_tty->print_cr(PTR_FORMAT " not an oop", (void *)obj); - *failures = true; - return; - } -@@ -901,8 +901,8 @@ void HeapRegion::verify(VerifyOption vo, - } - - if (p != top()) { -- gclog_or_tty->print_cr("end of last object "PTR_FORMAT" " -- "does not match top "PTR_FORMAT, p, top()); -+ gclog_or_tty->print_cr("end of last object " PTR_FORMAT " " -+ "does not match top " PTR_FORMAT, p, top()); - *failures = true; - return; - } -@@ -917,8 +917,8 @@ void HeapRegion::verify(VerifyOption vo, - HeapWord* addr_1 = p; - HeapWord* b_start_1 = _offsets.block_start_const(addr_1); - if (b_start_1 != p) { -- gclog_or_tty->print_cr("BOT look up for top: "PTR_FORMAT" " -- " yielded "PTR_FORMAT", expecting "PTR_FORMAT, -+ gclog_or_tty->print_cr("BOT look up for top: " PTR_FORMAT " " -+ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, - addr_1, b_start_1, p); - *failures = true; - return; -@@ -929,8 +929,8 @@ void HeapRegion::verify(VerifyOption vo, - if (addr_2 < the_end) { - HeapWord* b_start_2 = _offsets.block_start_const(addr_2); - if (b_start_2 != p) { -- gclog_or_tty->print_cr("BOT look up for top + 1: "PTR_FORMAT" " -- " yielded "PTR_FORMAT", expecting "PTR_FORMAT, -+ gclog_or_tty->print_cr("BOT look up for top + 1: " PTR_FORMAT " " -+ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, - addr_2, b_start_2, p); - *failures = true; - return; -@@ -943,8 +943,8 @@ void HeapRegion::verify(VerifyOption vo, - if (addr_3 < the_end) { - HeapWord* b_start_3 = _offsets.block_start_const(addr_3); - if (b_start_3 != p) { -- gclog_or_tty->print_cr("BOT look up for top + diff: "PTR_FORMAT" " -- " yielded "PTR_FORMAT", expecting "PTR_FORMAT, -+ gclog_or_tty->print_cr("BOT look up for top + diff: " PTR_FORMAT " " -+ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, - addr_3, b_start_3, p); - *failures = true; - return; -@@ -955,8 +955,8 @@ void HeapRegion::verify(VerifyOption vo, - HeapWord* addr_4 = the_end - 1; - HeapWord* b_start_4 = _offsets.block_start_const(addr_4); - if (b_start_4 != p) { -- gclog_or_tty->print_cr("BOT look up for end - 1: "PTR_FORMAT" " -- " yielded "PTR_FORMAT", expecting "PTR_FORMAT, -+ gclog_or_tty->print_cr("BOT look up for end - 1: " PTR_FORMAT " " -+ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, - addr_4, b_start_4, p); - *failures = true; - return; -@@ -964,8 +964,8 @@ void HeapRegion::verify(VerifyOption vo, - } - - if (is_humongous && object_num > 1) { -- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous " -- "but has "SIZE_FORMAT", objects", -+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is humongous " -+ "but has " SIZE_FORMAT ", objects", - bottom(), end(), object_num); - *failures = true; - return; ---- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp -@@ -52,7 +52,7 @@ class HeapRegion; - class HeapRegionSetBase; - class nmethod; - --#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]" -+#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]" - #define HR_FORMAT_PARAMS(_hr_) \ - (_hr_)->hrm_index(), \ - (_hr_)->get_short_type_str(), \ -@@ -534,8 +534,8 @@ class HeapRegion: public G1OffsetTableCo - void set_containing_set(HeapRegionSetBase* containing_set) { - assert((containing_set == NULL && _containing_set != NULL) || - (containing_set != NULL && _containing_set == NULL), -- err_msg("containing_set: "PTR_FORMAT" " -- "_containing_set: "PTR_FORMAT, -+ err_msg("containing_set: " PTR_FORMAT " " -+ "_containing_set: " PTR_FORMAT, - p2i(containing_set), p2i(_containing_set))); - - _containing_set = containing_set; ---- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp -@@ -112,7 +112,7 @@ HeapRegion::block_size(const HeapWord *a - - assert(ClassUnloadingWithConcurrentMark, - err_msg("All blocks should be objects if G1 Class Unloading isn't used. " -- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") " -+ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") " - "addr: " PTR_FORMAT, - p2i(bottom()), p2i(top()), p2i(end()), p2i(addr))); - ---- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp -@@ -432,7 +432,7 @@ void HeapRegionManager::verify() { - HeapRegion* hr = _regions.get_by_index(i); - guarantee(hr != NULL, err_msg("invariant: i: %u", i)); - guarantee(!prev_committed || hr->bottom() == prev_end, -- err_msg("invariant i: %u "HR_FORMAT" prev_end: "PTR_FORMAT, -+ err_msg("invariant i: %u " HR_FORMAT " prev_end: " PTR_FORMAT, - i, HR_FORMAT_PARAMS(hr), p2i(prev_end))); - guarantee(hr->hrm_index() == i, - err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index())); ---- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp -@@ -31,9 +31,9 @@ - - inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const { - assert(addr < heap_end(), -- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end()))); -+ err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end()))); - assert(addr >= heap_bottom(), -- err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); -+ err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); - - HeapRegion* hr = _regions.get_by_address(addr); - return hr; ---- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp -@@ -91,7 +91,7 @@ protected: - // concurrency. - - if (G1TraceHeapRegionRememberedSet) { -- gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT").", -+ gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").", - from, - UseCompressedOops - ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from) -@@ -381,7 +381,7 @@ void FromCardCache::initialize(uint n_pa - - void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) { - guarantee((size_t)start_idx + new_num_regions <= max_uintx, -- err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT, -+ err_msg("Trying to invalidate beyond maximum region, from %u size " SIZE_FORMAT, - start_idx, new_num_regions)); - for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { - uint end_idx = (start_idx + (uint)new_num_regions); -@@ -396,7 +396,7 @@ void FromCardCache::invalidate(uint star - void FromCardCache::print(outputStream* out) { - for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { - for (uint j = 0; j < _max_regions; j++) { -- out->print_cr("_from_card_cache["UINT32_FORMAT"]["UINT32_FORMAT"] = "INT32_FORMAT".", -+ out->print_cr("_from_card_cache[" UINT32_FORMAT "][" UINT32_FORMAT "] = " INT32_FORMAT ".", - i, j, at(i, j)); - } - } -@@ -436,7 +436,7 @@ void OtherRegionsTable::add_reference(Oo - int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift); - - if (G1TraceHeapRegionRememberedSet) { -- gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = "INT32_FORMAT")", -+ gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = " INT32_FORMAT ")", - hr()->bottom(), from_card, - FromCardCache::at((uint)tid, cur_hrm_ind)); - } -@@ -642,13 +642,13 @@ void OtherRegionsTable::scrub(CardTableM - - assert(_coarse_map.size() == region_bm->size(), "Precondition"); - if (G1RSScrubVerbose) { -- gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...", -+ gclog_or_tty->print(" Coarse map: before = " SIZE_FORMAT "...", - _n_coarse_entries); - } - _coarse_map.set_intersection(*region_bm); - _n_coarse_entries = _coarse_map.count_one_bits(); - if (G1RSScrubVerbose) { -- gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries); -+ gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries); - } - - // Now do the fine-grained maps. -@@ -1044,7 +1044,7 @@ bool HeapRegionRemSetIterator::fine_has_ - - card_index = _cur_region_card_offset + _cur_card_in_prt; - guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion, -- err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt)); -+ err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt)); - return true; - } - -@@ -1213,8 +1213,8 @@ void PerRegionTable::test_fl_mem_size() - - size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize; - assert(dummy->mem_size() > min_prt_size, -- err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. " -- "Should be at least "SIZE_FORMAT" bytes.", dummy->mem_size(), min_prt_size)); -+ err_msg("PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. " -+ "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size)); - free(dummy); - guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size"); - // try to reset the state ---- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp -@@ -32,7 +32,7 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC - uint FreeRegionList::_unrealistically_long_length = 0; - - void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) { -- msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT, -+ msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT, - name(), message, length(), total_capacity_bytes()); - fill_in_ext_msg_extra(msg); - } -@@ -84,13 +84,13 @@ void HeapRegionSetBase::verify_end() { - - void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) { - out->cr(); -- out->print_cr("Set: %s ("PTR_FORMAT")", name(), this); -+ out->print_cr("Set: %s (" PTR_FORMAT ")", name(), this); - out->print_cr(" Region Assumptions"); - out->print_cr(" humongous : %s", BOOL_TO_STR(regions_humongous())); - out->print_cr(" free : %s", BOOL_TO_STR(regions_free())); - out->print_cr(" Attributes"); - out->print_cr(" length : %14u", length()); -- out->print_cr(" total capacity : "SIZE_FORMAT_W(14)" bytes", -+ out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes", - total_capacity_bytes()); - } - -@@ -106,7 +106,7 @@ void FreeRegionList::set_unrealistically - } - - void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) { -- msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail); -+ msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, _head, _tail); - } - - void FreeRegionList::remove_all() { -@@ -277,8 +277,8 @@ void FreeRegionList::clear() { - void FreeRegionList::print_on(outputStream* out, bool print_contents) { - HeapRegionSetBase::print_on(out, print_contents); - out->print_cr(" Linking"); -- out->print_cr(" head : "PTR_FORMAT, _head); -- out->print_cr(" tail : "PTR_FORMAT, _tail); -+ out->print_cr(" head : " PTR_FORMAT, _head); -+ out->print_cr(" tail : " PTR_FORMAT, _tail); - - if (print_contents) { - out->print_cr(" Contents"); -@@ -306,7 +306,7 @@ void FreeRegionList::verify_list() { - - count++; - guarantee(count < _unrealistically_long_length, -- 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())); -+ 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())); - - if (curr->next() != NULL) { - guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up"); ---- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp -@@ -668,7 +668,7 @@ jlong PSMarkSweep::millis_since_last_gc( - jlong ret_val = now - _time_of_last_gc; - // XXX See note in genCollectedHeap::millis_since_last_gc(). - if (ret_val < 0) { -- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);) -+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);) - return 0; - } - return ret_val; ---- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp -@@ -3291,7 +3291,7 @@ jlong PSParallelCompact::millis_since_la - jlong ret_val = now - _time_of_last_gc; - // XXX See note in genCollectedHeap::millis_since_last_gc(). - if (ret_val < 0) { -- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);) -+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);) - return 0; - } - return ret_val; ---- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp -@@ -86,7 +86,7 @@ void MutableNUMASpace::ensure_parsabilit - while (words_left_to_fill > 0) { - size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size()); - assert(words_to_fill >= CollectedHeap::min_fill_size(), -- err_msg("Remaining size ("SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")", -+ err_msg("Remaining size (" SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")", - words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size())); - CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill); - if (!os::numa_has_static_binding()) { ---- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp.orig -+++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp -@@ -98,10 +98,10 @@ void PLABStats::adjust_desired_plab_sz(u - if (_allocated == 0) { - assert(_unused == 0, - err_msg("Inconsistency in PLAB stats: " -- "_allocated: "SIZE_FORMAT", " -- "_wasted: "SIZE_FORMAT", " -- "_unused: "SIZE_FORMAT", " -- "_used : "SIZE_FORMAT, -+ "_allocated: " SIZE_FORMAT ", " -+ "_wasted: " SIZE_FORMAT ", " -+ "_unused: " SIZE_FORMAT ", " -+ "_used : " SIZE_FORMAT, - _allocated, _wasted, _unused, _used)); - - _allocated = 1; ---- hotspot/src/share/vm/memory/cardTableModRefBS.hpp.orig -+++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp -@@ -158,8 +158,8 @@ class CardTableModRefBS: public ModRefBa - // Mapping from address to card marking array entry - jbyte* byte_for(const void* p) const { - assert(_whole_heap.contains(p), -- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of " -- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", -+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of " -+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", - p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); - jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift]; - assert(result >= _byte_map && result < _byte_map + _byte_map_size, -@@ -436,8 +436,8 @@ public: - size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte)); - HeapWord* result = (HeapWord*) (delta << card_shift); - assert(_whole_heap.contains(result), -- err_msg("Returning result = "PTR_FORMAT" out of bounds of " -- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", -+ err_msg("Returning result = " PTR_FORMAT " out of bounds of " -+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", - p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); - return result; - } -@@ -445,8 +445,8 @@ public: - // Mapping from address to card marking array index. - size_t index_for(void* p) { - assert(_whole_heap.contains(p), -- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of " -- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", -+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of " -+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", - p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); - return byte_for(p) - _byte_map; - } ---- hotspot/src/share/vm/memory/genCollectedHeap.cpp.orig -+++ hotspot/src/share/vm/memory/genCollectedHeap.cpp -@@ -1403,7 +1403,7 @@ jlong GenCollectedHeap::millis_since_las - // back a time later than 'now'. - jlong retVal = now - tolgc_cl.time(); - if (retVal < 0) { -- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);) -+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);) - return 0; - } - return retVal; ---- hotspot/src/share/vm/memory/generation.cpp.orig -+++ hotspot/src/share/vm/memory/generation.cpp -@@ -187,7 +187,7 @@ bool Generation::promotion_attempt_is_sa - bool res = (available >= max_promotion_in_bytes); - if (PrintGC && Verbose) { - gclog_or_tty->print_cr( -- "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")", -+ "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")", - res? "":" not", available, res? ">=":"<", - max_promotion_in_bytes); - } ---- hotspot/src/share/vm/memory/generation.hpp.orig -+++ hotspot/src/share/vm/memory/generation.hpp -@@ -422,7 +422,7 @@ class Generation: public CHeapObj<mtGC> - // have to guard against non-monotonicity. - NOT_PRODUCT( - if (now < _time_of_last_gc) { -- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); -+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); - } - ) - return _time_of_last_gc; ---- hotspot/src/share/vm/memory/referenceProcessor.cpp.orig -+++ hotspot/src/share/vm/memory/referenceProcessor.cpp -@@ -161,7 +161,7 @@ void ReferenceProcessor::update_soft_ref - - NOT_PRODUCT( - if (now < _soft_ref_timestamp_clock) { -- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, -+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, - _soft_ref_timestamp_clock, now); - } - ) ---- hotspot/src/share/vm/memory/tenuredGeneration.cpp.orig -+++ hotspot/src/share/vm/memory/tenuredGeneration.cpp -@@ -294,8 +294,8 @@ bool TenuredGeneration::promotion_attemp - bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); - if (PrintGC && Verbose) { - gclog_or_tty->print_cr( -- "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT")," -- "max_promo("SIZE_FORMAT")", -+ "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT ")," -+ "max_promo(" SIZE_FORMAT ")", - res? "":" not", available, res? ">=":"<", - av_promo, max_promotion_in_bytes); - } ---- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.orig -+++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp -@@ -94,10 +94,10 @@ void ThreadLocalAllocBuffer::record_slow - - if (PrintTLAB && Verbose) { - Thread* thrd = myThread(); -- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]" -- " obj: "SIZE_FORMAT -- " free: "SIZE_FORMAT -- " waste: "SIZE_FORMAT"\n", -+ gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]" -+ " obj: " SIZE_FORMAT -+ " free: " SIZE_FORMAT -+ " waste: " SIZE_FORMAT "\n", - "slow", p2i(thrd), thrd->osthread()->thread_id(), - obj_size, free(), refill_waste_limit()); - } ---- hotspot/src/share/vm/memory/universe.cpp.orig -+++ hotspot/src/share/vm/memory/universe.cpp -@@ -926,7 +926,7 @@ void Universe::print_compressed_oops_mod - // Reserve the Java heap, which is now the same for all GCs. - ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) { - assert(alignment <= Arguments::conservative_max_heap_alignment(), -- err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT, -+ err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT, - alignment, Arguments::conservative_max_heap_alignment())); - size_t total_reserved = align_size_up(heap_size, alignment); - assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())), ---- hotspot/src/share/vm/oops/constantPool.cpp.orig -+++ hotspot/src/share/vm/oops/constantPool.cpp -@@ -1494,7 +1494,7 @@ static void print_cpool_bytes(jint cnt, - } - case JVM_CONSTANT_Long: { - u8 val = Bytes::get_Java_u8(bytes); -- printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val); -+ printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val); - ent_size = 8; - idx++; // Long takes two cpool slots - break; ---- hotspot/src/share/vm/oops/cpCache.cpp.orig -+++ hotspot/src/share/vm/oops/cpCache.cpp -@@ -315,7 +315,7 @@ void ConstantPoolCacheEntry::set_method_ - adapter->size_of_parameters()); - - if (TraceInvokeDynamic) { -- tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ", -+ tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ", - invoke_code, - (void *)appendix(), (has_appendix ? "" : " (unused)"), - (void *)method_type(), (has_method_type ? "" : " (unused)"), -@@ -529,12 +529,12 @@ void ConstantPoolCacheEntry::print(outpu - // print separator - if (index == 0) st->print_cr(" -------------"); - // print entry -- st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this); -+ st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this); - st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(), - constant_pool_index()); -- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1); -- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2); -- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags); -+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1); -+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2); -+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags); - st->print_cr(" -------------"); - } - ---- hotspot/src/share/vm/oops/markOop.cpp.orig -+++ hotspot/src/share/vm/oops/markOop.cpp -@@ -49,7 +49,7 @@ void markOopDesc::print_on(outputStream* - st->print("monitor=NULL"); - else { - BasicLock * bl = (BasicLock *) mon->owner(); -- st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}", -+ st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}", - mon->count(), mon->waiters(), mon->recursions(), p2i(bl)); - } - } else { ---- hotspot/src/share/vm/oops/objArrayKlass.cpp.orig -+++ hotspot/src/share/vm/oops/objArrayKlass.cpp -@@ -657,7 +657,7 @@ void ObjArrayKlass::oop_print_value_on(o - if (i > max_objArray_print_length) { - st->print("..."); break; - } -- st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i)); -+ st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i)); - } - st->print(" }"); - } ---- hotspot/src/share/vm/oops/oop.cpp.orig -+++ hotspot/src/share/vm/oops/oop.cpp -@@ -46,7 +46,7 @@ void oopDesc::print_on(outputStream* st) - - void oopDesc::print_address_on(outputStream* st) const { - if (PrintOopAddress) { -- st->print("{"INTPTR_FORMAT"}", this); -+ st->print("{" INTPTR_FORMAT "}", this); - } - } - ---- hotspot/src/share/vm/prims/methodHandles.cpp.orig -+++ hotspot/src/share/vm/prims/methodHandles.cpp -@@ -1342,27 +1342,27 @@ JVM_END - - // These are the native methods on java.lang.invoke.MethodHandleNatives. - static JNINativeMethod MHN_methods[] = { -- {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)}, -- {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)}, -- {CC"resolve", CC"("MEM""CLS")"MEM, FN_PTR(MHN_resolve_Mem)}, -- {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)}, -+ {CC "init", CC "(" MEM "" OBJ ")V", FN_PTR(MHN_init_Mem)}, -+ {CC "expand", CC "(" MEM ")V", FN_PTR(MHN_expand_Mem)}, -+ {CC "resolve", CC "(" MEM "" CLS ")" MEM, FN_PTR(MHN_resolve_Mem)}, -+ {CC "getConstant", CC "(I)I", FN_PTR(MHN_getConstant)}, - // static native int getNamedCon(int which, Object[] name) -- {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)}, -+ {CC "getNamedCon", CC "(I[" OBJ ")I", FN_PTR(MHN_getNamedCon)}, - // static native int getMembers(Class<?> defc, String matchName, String matchSig, - // int matchFlags, Class<?> caller, int skip, MemberName[] results); -- {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)}, -- {CC"objectFieldOffset", CC"("MEM")J", FN_PTR(MHN_objectFieldOffset)}, -- {CC"setCallSiteTargetNormal", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetNormal)}, -- {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, -- {CC"staticFieldOffset", CC"("MEM")J", FN_PTR(MHN_staticFieldOffset)}, -- {CC"staticFieldBase", CC"("MEM")"OBJ, FN_PTR(MHN_staticFieldBase)}, -- {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)} -+ {CC "getMembers", CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)}, -+ {CC "objectFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_objectFieldOffset)}, -+ {CC "setCallSiteTargetNormal", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetNormal)}, -+ {CC "setCallSiteTargetVolatile", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, -+ {CC "staticFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_staticFieldOffset)}, -+ {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)}, -+ {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)} - }; - - static JNINativeMethod MH_methods[] = { - // UnsupportedOperationException throwers -- {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)}, -- {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)} -+ {CC"invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)}, -+ {CC"invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)} - }; - - /** ---- hotspot/src/share/vm/prims/perf.cpp.orig -+++ hotspot/src/share/vm/prims/perf.cpp -@@ -290,17 +290,17 @@ PERF_END - #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) - #define BB "Ljava/nio/ByteBuffer;" - #define JLS "Ljava/lang/String;" --#define CL_ARGS CC"("JLS"IIJ)"BB --#define CBA_ARGS CC"("JLS"II[BI)"BB -+#define CL_ARGS CC "(" JLS "IIJ)" BB -+#define CBA_ARGS CC "(" JLS "II[BI)" BB - - static JNINativeMethod perfmethods[] = { - -- {CC"attach", CC"("JLS"II)"BB, FN_PTR(Perf_Attach)}, -- {CC"detach", CC"("BB")V", FN_PTR(Perf_Detach)}, -- {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, -- {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)}, -- {CC"highResCounter", CC"()J", FN_PTR(Perf_HighResCounter)}, -- {CC"highResFrequency", CC"()J", FN_PTR(Perf_HighResFrequency)} -+ {CC"attach", CC "(" JLS "II)" BB, FN_PTR(Perf_Attach)}, -+ {CC"detach", CC "(" BB ")V", FN_PTR(Perf_Detach)}, -+ {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, -+ {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)}, -+ {CC"highResCounter", CC "()J", FN_PTR(Perf_HighResCounter)}, -+ {CC"highResFrequency", CC "()J", FN_PTR(Perf_HighResFrequency)} - }; - - #undef CBA_ARGS ---- hotspot/src/share/vm/prims/unsafe.cpp.orig -+++ hotspot/src/share/vm/prims/unsafe.cpp -@@ -1001,7 +1001,7 @@ UNSAFE_ENTRY(jclass, Unsafe_DefineClass0 - UNSAFE_END - - --#define DAC_Args CLS"[B["OBJ -+#define DAC_Args CLS "[B[" OBJ - // define a class but do not make it known to the class loader or system dictionary - // - host_class: supplies context for linkage, access control, protection domain, and class loader - // - data: bytes of a class file, a raw memory address (length gives the number of bytes) -@@ -1366,47 +1366,47 @@ UNSAFE_END - - #define LANG "Ljava/lang/" - --#define OBJ LANG"Object;" --#define CLS LANG"Class;" --#define CTR LANG"reflect/Constructor;" --#define FLD LANG"reflect/Field;" --#define MTH LANG"reflect/Method;" --#define THR LANG"Throwable;" -+#define OBJ LANG "Object;" -+#define CLS LANG "Class;" -+#define CTR LANG "reflect/Constructor;" -+#define FLD LANG "reflect/Field;" -+#define MTH LANG "reflect/Method;" -+#define THR LANG "Throwable;" - --#define DC0_Args LANG"String;[BII" --#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;" -+#define DC0_Args LANG "String;[BII" -+#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;" - - #define CC (char*) /*cast a literal from (const char*)*/ - #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) - - // define deprecated accessors for compabitility with 1.4.0 - #define DECLARE_GETSETOOP_140(Boolean, Z) \ -- {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ -- {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)} -+ {CC"get"#Boolean, CC"(" OBJ "I)" #Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ -+ {CC"put"#Boolean, CC"(" OBJ "I" #Z ")V", FN_PTR(Unsafe_Set##Boolean##140)} - - // Note: In 1.4.1, getObject and kin take both int and long offsets. - #define DECLARE_GETSETOOP_141(Boolean, Z) \ -- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ -- {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)} -+ {CC"get"#Boolean, CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \ -+ {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)} - - // Note: In 1.5.0, there are volatile versions too - #define DECLARE_GETSETOOP(Boolean, Z) \ -- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ -- {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \ -- {CC"get"#Boolean"Volatile", CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ -- {CC"put"#Boolean"Volatile", CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} -+ {CC"get"#Boolean, CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \ -+ {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}, \ -+ {CC"get"#Boolean "Volatile", CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ -+ {CC"put"#Boolean "Volatile", CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} - - - #define DECLARE_GETSETNATIVE(Byte, B) \ -- {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \ -- {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)} -+ {CC"get"#Byte, CC"(" ADR ")" #B, FN_PTR(Unsafe_GetNative##Byte)}, \ -+ {CC"put"#Byte, CC"(" ADR #B ")V", FN_PTR(Unsafe_SetNative##Byte)} - - - - // These are the methods for 1.4.0 - static JNINativeMethod methods_140[] = { -- {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)}, -- {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)}, -+ {CC"getObject", CC"(" OBJ "I)" OBJ "", FN_PTR(Unsafe_GetObject140)}, -+ {CC"putObject", CC"(" OBJ "I" OBJ ")V", FN_PTR(Unsafe_SetObject140)}, - - DECLARE_GETSETOOP_140(Boolean, Z), - DECLARE_GETSETOOP_140(Byte, B), -@@ -1425,33 +1425,33 @@ static JNINativeMethod methods_140[] = { - DECLARE_GETSETNATIVE(Float, F), - DECLARE_GETSETNATIVE(Double, D), - -- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, -- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, -+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, -+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, - -- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, -- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, -- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, -- -- {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)}, -- {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, -- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, -+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, -+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, -+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, -+ -+ {CC"fieldOffset", CC"(" FLD ")I", FN_PTR(Unsafe_FieldOffset)}, -+ {CC"staticFieldBase", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, -+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - -- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, -- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, -- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, -- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, -- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, -- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)} -+ {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, -+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, -+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, -+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, -+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, -+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)} - }; - - // These are the methods prior to the JSR 166 changes in 1.5.0 - static JNINativeMethod methods_141[] = { -- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, -- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, -+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, -+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, - - DECLARE_GETSETOOP_141(Boolean, Z), - DECLARE_GETSETOOP_141(Byte, B), -@@ -1470,37 +1470,37 @@ static JNINativeMethod methods_141[] = { - DECLARE_GETSETNATIVE(Float, F), - DECLARE_GETSETNATIVE(Double, D), - -- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, -- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, -+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, -+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, - -- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, -- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, -- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, -- -- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, -- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, -- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, -- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, -+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, -+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, -+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, -+ -+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, -+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, -+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, -+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - -- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, -- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, -- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, -- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, -- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, -- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)} -+ {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, -+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, -+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, -+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, -+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, -+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)} - - }; - - // These are the methods prior to the JSR 166 changes in 1.6.0 - static JNINativeMethod methods_15[] = { -- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, -- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, -- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, -- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, -+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, -+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, -+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, -+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, - - - DECLARE_GETSETOOP(Boolean, Z), -@@ -1520,42 +1520,42 @@ static JNINativeMethod methods_15[] = { - DECLARE_GETSETNATIVE(Float, F), - DECLARE_GETSETNATIVE(Double, D), - -- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, -- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, -+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, -+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, - -- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, -- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, -- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, -- -- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, -- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, -- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, -- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, -+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, -+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, -+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, -+ -+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, -+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, -+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, -+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - -- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, -- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, -- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, -- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, -- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, -- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, -- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, -- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, -- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, -+ {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, -+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, -+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, -+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, -+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, -+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}, -+ {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, -+ {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, -+ {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, -- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} -+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} - - }; - - // These are the methods for 1.6.0 and 1.7.0 - static JNINativeMethod methods_16[] = { -- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, -- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, -- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, -- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, -+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, -+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, -+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, -+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, - - DECLARE_GETSETOOP(Boolean, Z), - DECLARE_GETSETOOP(Byte, B), -@@ -1574,45 +1574,45 @@ static JNINativeMethod methods_16[] = { - DECLARE_GETSETNATIVE(Float, F), - DECLARE_GETSETNATIVE(Double, D), - -- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, -- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, -+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, -+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, - -- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, -- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, -- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, -- -- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, -- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, -- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, -- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, -+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, -+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, -+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, -+ -+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, -+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, -+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, -+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - -- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, -- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, -- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, -- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, -- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, -- {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, -- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, -- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, -- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, -- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, -- {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, -- {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, -- {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, -+ {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, -+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, -+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, -+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, -+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, -+ {CC"tryMonitorEnter", CC"(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, -+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}, -+ {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, -+ {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, -+ {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, -+ {CC"putOrderedObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)}, -+ {CC"putOrderedInt", CC"(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)}, -+ {CC"putOrderedLong", CC"(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, -- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} -+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} - }; - - // These are the methods for 1.8.0 - static JNINativeMethod methods_18[] = { -- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, -- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, -- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, -- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, -+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, -+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, -+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, -+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, - - DECLARE_GETSETOOP(Boolean, Z), - DECLARE_GETSETOOP(Byte, B), -@@ -1631,36 +1631,36 @@ static JNINativeMethod methods_18[] = { - DECLARE_GETSETNATIVE(Float, F), - DECLARE_GETSETNATIVE(Double, D), - -- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, -- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, -+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, -+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, - -- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, -- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, -- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, -- -- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, -- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, -- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, -- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, -+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, -+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, -+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, -+ -+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, -+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, -+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, -+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, -+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, -+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - -- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, -- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, -- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, -- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, -- {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, -- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, -- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, -- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, -- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, -- {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, -- {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, -- {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, -+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, -+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, -+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, -+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, -+ {CC"tryMonitorEnter", CC"(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, -+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}, -+ {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, -+ {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, -+ {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, -+ {CC"putOrderedObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)}, -+ {CC"putOrderedInt", CC"(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)}, -+ {CC"putOrderedLong", CC"(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, -- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} -+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} - }; - - JNINativeMethod loadavg_method[] = { -@@ -1668,28 +1668,28 @@ JNINativeMethod loadavg_method[] = { - }; - - JNINativeMethod prefetch_methods[] = { -- {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, -- {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}, -- {CC"prefetchReadStatic", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, -- {CC"prefetchWriteStatic",CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)} -+ {CC"prefetchRead", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, -+ {CC"prefetchWrite", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)}, -+ {CC"prefetchReadStatic", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, -+ {CC"prefetchWriteStatic",CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)} - }; - - JNINativeMethod memcopy_methods_17[] = { -- {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)}, -- {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)} -+ {CC"copyMemory", CC"(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)}, -+ {CC"setMemory", CC"(" OBJ "JJB)V", FN_PTR(Unsafe_SetMemory2)} - }; - - JNINativeMethod memcopy_methods_15[] = { -- {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, -- {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)} -+ {CC"setMemory", CC"(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, -+ {CC"copyMemory", CC"(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)} - }; - - JNINativeMethod anonk_methods[] = { -- {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, -+ {CC"defineAnonymousClass", CC"(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, - }; - - JNINativeMethod lform_methods[] = { -- {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, -+ {CC"shouldBeInitialized",CC"(" CLS ")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, - }; - - JNINativeMethod fence_methods[] = { ---- hotspot/src/share/vm/prims/whitebox.cpp.orig -+++ hotspot/src/share/vm/prims/whitebox.cpp -@@ -166,8 +166,8 @@ WB_END - - WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) { - CollectorPolicy * p = Universe::heap()->collector_policy(); -- gclog_or_tty->print_cr("Minimum heap "SIZE_FORMAT" Initial heap " -- SIZE_FORMAT" Maximum heap "SIZE_FORMAT" Min alignment "SIZE_FORMAT" Max alignment "SIZE_FORMAT, -+ gclog_or_tty->print_cr("Minimum heap " SIZE_FORMAT " Initial heap " -+ SIZE_FORMAT " Maximum heap " SIZE_FORMAT " Min alignment " SIZE_FORMAT " Max alignment " SIZE_FORMAT, - p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(), - p->space_alignment(), p->heap_alignment()); - } -@@ -202,8 +202,8 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(J - Universe::narrow_oop_use_implicit_null_checks() )) { - tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n " - "\tUseCompressedOops is %d\n" -- "\trhs.base() is "PTR_FORMAT"\n" -- "\tUniverse::narrow_oop_base() is "PTR_FORMAT"\n" -+ "\trhs.base() is " PTR_FORMAT "\n" -+ "\tUniverse::narrow_oop_base() is " PTR_FORMAT "\n" - "\tUniverse::narrow_oop_use_implicit_null_checks() is %d", - UseCompressedOops, - rhs.base(), -@@ -256,8 +256,8 @@ static jint wb_stress_virtual_space_resi - - WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o, - jlong reserved_space_size, jlong magnitude, jlong iterations)) -- tty->print_cr("reservedSpaceSize="JLONG_FORMAT", magnitude="JLONG_FORMAT", " -- "iterations="JLONG_FORMAT"\n", reserved_space_size, magnitude, -+ tty->print_cr("reservedSpaceSize=" JLONG_FORMAT ", magnitude=" JLONG_FORMAT ", " -+ "iterations=" JLONG_FORMAT "\n", reserved_space_size, magnitude, - iterations); - if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) { - tty->print_cr("One of variables printed above is negative. Can't proceed.\n"); ---- hotspot/src/share/vm/runtime/safepoint.cpp.orig -+++ hotspot/src/share/vm/runtime/safepoint.cpp -@@ -918,7 +918,7 @@ void ThreadSafepointState::restart() { - - case _running: - default: -- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d", -+ tty->print_cr("restart thread " INTPTR_FORMAT " with state %d", - _thread, _type); - _thread->print(); - ShouldNotReachHere(); -@@ -1275,14 +1275,14 @@ void SafepointSynchronize::print_stat_on - - for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) { - if (_safepoint_reasons[index] != 0) { -- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index), -+ tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index), - _safepoint_reasons[index]); - } - } - - tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint", - _coalesced_vmop_count); -- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms", -+ tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms", - _max_sync_time / MICROUNITS); - tty->print_cr("Maximum vm operation time (except for Exit VM operation) " - INT64_FORMAT_W(5)" ms", ---- hotspot/src/share/vm/services/threadService.cpp.orig -+++ hotspot/src/share/vm/services/threadService.cpp -@@ -889,7 +889,7 @@ void DeadlockCycle::print_on(outputStrea - st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor); - oop obj = (oop)waitingToLockMonitor->object(); - if (obj != NULL) { -- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj, -+ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj, - (InstanceKlass::cast(obj->klass()))->external_name()); - - if (!currentThread->current_pending_monitor_is_from_java()) { ---- hotspot/src/share/vm/trace/traceStream.hpp.orig -+++ hotspot/src/share/vm/trace/traceStream.hpp -@@ -40,31 +40,31 @@ class TraceStream : public StackObj { - TraceStream(outputStream& stream): _st(stream) {} - - void print_val(const char* label, u1 val) { -- _st.print("%s = "UINT32_FORMAT, label, val); -+ _st.print("%s = " UINT32_FORMAT, label, val); - } - - void print_val(const char* label, u2 val) { -- _st.print("%s = "UINT32_FORMAT, label, val); -+ _st.print("%s = " UINT32_FORMAT, label, val); - } - - void print_val(const char* label, s2 val) { -- _st.print("%s = "INT32_FORMAT, label, val); -+ _st.print("%s = " INT32_FORMAT, label, val); - } - - void print_val(const char* label, u4 val) { -- _st.print("%s = "UINT32_FORMAT, label, val); -+ _st.print("%s = " UINT32_FORMAT, label, val); - } - - void print_val(const char* label, s4 val) { -- _st.print("%s = "INT32_FORMAT, label, val); -+ _st.print("%s = " INT32_FORMAT, label, val); - } - - void print_val(const char* label, u8 val) { -- _st.print("%s = "UINT64_FORMAT, label, val); -+ _st.print("%s = " UINT64_FORMAT, label, val); - } - - void print_val(const char* label, s8 val) { -- _st.print("%s = "INT64_FORMAT, label, (int64_t) val); -+ _st.print("%s = " INT64_FORMAT, label, (int64_t) val); - } - - void print_val(const char* label, bool val) { ---- hotspot/src/share/vm/utilities/ostream.cpp.orig -+++ hotspot/src/share/vm/utilities/ostream.cpp -@@ -277,7 +277,7 @@ void outputStream::print_data(void* data - size_t limit = (len + 16) / 16 * 16; - for (size_t i = 0; i < limit; ++i) { - if (i % 16 == 0) { -- indent().print(SIZE_FORMAT_HEX_W(07)":", i); -+ indent().print(SIZE_FORMAT_HEX_W(07) ":", i); - } - if (i % 2 == 0) { - print(" "); -@@ -945,7 +945,7 @@ void defaultStream::start_log() { - // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if - // we ever get round to introduce that method on the os class - xs->head("hotspot_log version='%d %d'" -- " process='%d' time_ms='"INT64_FORMAT"'", -+ " process='%d' time_ms='" INT64_FORMAT "'", - LOG_MAJOR_VERSION, LOG_MINOR_VERSION, - os::current_process_id(), (int64_t)time_ms); - // 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 @@ ---- jdk/make/GenerateSources.gmk.orig -+++ jdk/make/GenerateSources.gmk -@@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows) - GENSRC += $(GENSRC_OSX_ICONS) - endif - -- ifneq ($(OPENJDK_TARGET_OS), macosx) -- include gensrc/GensrcX11Wrappers.gmk -- GENSRC += $(GENSRC_X11WRAPPERS) -+ ifndef BUILD_HEADLESS_ONLY -+ ifneq ($(OPENJDK_TARGET_OS), macosx) -+ include gensrc/GensrcX11Wrappers.gmk -+ GENSRC += $(GENSRC_X11WRAPPERS) -+ endif - endif - endif - 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 @@ ---- hotspot/make/linux/makefiles/dtrace.make.orig 2015-09-01 08:00:59.737868760 +0200 -+++ hotspot/make/linux/makefiles/dtrace.make 2015-09-01 08:01:24.049859677 +0200 -@@ -40,7 +40,7 @@ - ifneq ($(ALT_SDT_H),) - SDT_H_FILE = $(ALT_SDT_H) - else -- SDT_H_FILE = /usr/include/sys/sdt.h -+ SDT_H_FILE = $(SYS_ROOT)/usr/include/sys/sdt.h - endif - DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) - REASON = "$(SDT_H_FILE) not found" diff --git a/recipes-core/rhino/rhino_1.7r4.bb b/recipes-core/rhino/rhino_1.7r4.bb index 4242005..d645e8a 100644 --- a/recipes-core/rhino/rhino_1.7r4.bb +++ b/recipes-core/rhino/rhino_1.7r4.bb @@ -2,7 +2,7 @@ SUMMARY = "Lexical analyzer generator for Java" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8e2372bdbf22c99279ae4599a13cc458" -DEPENDS_class-native += "classpath-native" +DEPENDS:class-native += "classpath-native" BBCLASSEXTEND = "native" @@ -10,19 +10,20 @@ PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit java-library +SRCREV = "82ffb8f3e09e77e3b1f5782c35b621e7ca742b58" SRC_URI = "\ - https://github.com/downloads/mozilla/rhino/rhino1_7R4.zip \ + git://github.com/mozilla/rhino;protocol=https;branch=master \ file://rhino \ file://rhino-jsc \ " -S = "${WORKDIR}/rhino1_7R4" +S = "${WORKDIR}/git" PACKAGES = "${JPN} rhino" -FILES_${PN} = "${bindir}/rhino ${bindir}/rhino-jsc" -RDEPENDS_${PN} = "java2-runtime ${JPN}" -RDEPENDS_${PN}_class-native = "" +FILES:${PN} = "${bindir}/rhino ${bindir}/rhino-jsc" +RDEPENDS:${PN} = "java2-runtime ${JPN}" +RDEPENDS:${PN}:class-native = "" do_compile() { mkdir -p build @@ -39,12 +40,9 @@ do_compile() { fastjar cfm ${JARFILENAME} ${S}/src/manifest -C build . } -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/rhino ${D}${bindir} install -m 0755 ${WORKDIR}/rhino-jsc ${D}${bindir} } - -SRC_URI[md5sum] = "ad67a3dff135e3a70f0c3528a2d6edf2" -SRC_URI[sha256sum] = "9eb08f85bbe7c8e0b9eaffb1cf4984b31fb679f3c8a682acc3bb8ac20626c61e" diff --git a/recipes-core/servlet-api/jsp2.0_5.5.26.bb b/recipes-core/servlet-api/jsp2.0_5.5.26.bb index 286d6d5..ac8617c 100644 --- a/recipes-core/servlet-api/jsp2.0_5.5.26.bb +++ b/recipes-core/servlet-api/jsp2.0_5.5.26.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/apache-tomcat-${PV}-src/servletapi/jsr152" inherit java-library DEPENDS = "servlet2.4" -RDEPENDS_${PN} = "libservlet2.4-java" +RDEPENDS:${PN} = "libservlet2.4-java" # Value of implementation.revision in build.xml IMPL_REVISION = "public_draft" diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb b/recipes-core/xalan-j/xalan-j_2.7.1.bb index ad985cb..d09f9f9 100644 --- a/recipes-core/xalan-j/xalan-j_2.7.1.bb +++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb @@ -12,8 +12,8 @@ PR = "r2" DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel" SRC_URI = "\ - http://archive.apache.org/dist/xml/${BPN}/${BPN}_2_7_1-src.tar.gz;name=archive \ - http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-2.4.0.tar.gz;name=bsf \ + https://archive.apache.org/dist/xml/${BPN}/source/${BPN}_2_7_1-src.tar.gz;name=archive \ + https://dlcdn.apache.org/commons/bsf/source/bsf-src-2.4.0.tar.gz;name=bsf \ " S = "${WORKDIR}/${BPN}_2_7_1" @@ -47,14 +47,14 @@ do_compile() { fastjar cf serializer-${PV}.jar -C build-serializer . } -do_install_append() { +do_install:append() { oe_jarinstall serializer-${PV}.jar serializer.jar } PACKAGES = "libxalan2-serializer-java ${JPN}" -FILES_libxalan2-serializer-java = "${datadir_java}/serializer*.jar" +FILES:libxalan2-serializer-java = "${datadir_java}/serializer*.jar" SRC_URI[archive.md5sum] = "fc805051f0fe505c7a4b1b5c8db9b9e3" SRC_URI[archive.sha256sum] = "fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043" diff --git a/recipes-core/xerces-j/xerces-j_2.11.0.bb b/recipes-core/xerces-j/xerces-j_2.11.0.bb index 98ef32f..45d3c43 100644 --- a/recipes-core/xerces-j/xerces-j_2.11.0.bb +++ b/recipes-core/xerces-j/xerces-j_2.11.0.bb @@ -12,7 +12,13 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.serializer.txt;md5=d229da563da18fe5d58cd95a6467d584 \ " -SRC_URI = "http://archive.apache.org/dist/xerces/j/Xerces-J-src.${PV}.tar.gz" +SRC_URI = "http://archive.apache.org/dist/xerces/j/source/Xerces-J-src.${PV}.tar.gz" + +# CVE only applies to some Oracle Java SE and Red Hat Enterprise Linux versions. +# Already fixed with updates and closed. +# https://access.redhat.com/security/cve/CVE-2018-2799 +# https://bugzilla.redhat.com/show_bug.cgi?id=1567542 +CVE_STATUS[CVE-2018-2799] = "not-applicable-platform: Issue only applies on some Oracle Java SE and Red Hat Enterprise Linux versions" S = "${WORKDIR}/xerces-2_11_0" @@ -22,8 +28,8 @@ JPN = "libxerces2-java" DEPENDS = "fastjar-native jaxp1.3 xml-commons-resolver1.1" -RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" +RDEPENDS:${PN}:class-native = "" do_unpackpost[dirs] = "${B}" do_unpackpost() { diff --git a/recipes-core/xml-commons/dom4j_1.6.1.bb b/recipes-core/xml-commons/dom4j_1.6.1.bb index 97c9947..0ba3f0e 100644 --- a/recipes-core/xml-commons/dom4j_1.6.1.bb +++ b/recipes-core/xml-commons/dom4j_1.6.1.bb @@ -1,6 +1,6 @@ SUMMARY = "A simple and flexible library for working with XML, XPath and XSLT" DESCRIPTION = "dom4j is a simple and flexible Java library for working with XML, XPath and XSLT" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3f752b663f2a821c3b32482fc6aece3c" HOMEPAGE = "http://dom4j.github.io" @@ -18,6 +18,7 @@ SRC_URI[archive.sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e192 SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4" SRC_URI[jaxme.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc" +PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit java-library do_compile() { diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb b/recipes-core/xml-commons/jaxen_1.1.6.bb index 2741f2c..13f5fdc 100644 --- a/recipes-core/xml-commons/jaxen_1.1.6.bb +++ b/recipes-core/xml-commons/jaxen_1.1.6.bb @@ -4,7 +4,7 @@ DOM, XOM, dom4j, and JDOM. Is it also possible to write adapters that \ treat non-XML trees such as compiled Java byte code or Java beans as XML, \ thus enabling you to query these trees with XPath too.\ " -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a2e66c2e2482aa23c11342f1469fa3b6" HOMEPAGE = "http://jaxen.org/" @@ -15,7 +15,7 @@ DEPENDS = "fastjar-native virtual/javac-native xerces-j xom" SRCREV = "7d7755ac8b19daa2ff6f319f432b864cc72d89b6" SRC_URI = "\ - git://github.com/codehaus/${BPN} \ + git://github.com/codehaus/${BPN};protocol=https;branch=master \ http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \ " SRC_URI[jdom.md5sum] = "22745cbaaddb12884ed8ee09083d8fe2" diff --git a/recipes-core/xml-commons/jaxme_0.5.2.bb b/recipes-core/xml-commons/jaxme_0.5.2.bb deleted file mode 100644 index b563cc6..0000000 --- a/recipes-core/xml-commons/jaxme_0.5.2.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "Implementation of the JAXB API" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -AUTHOR = "Apache Software Foundation" -HOMEPAGE = "http://ws.apache.org/jaxme" - -SRC_URI = "\ - http://apache.org/dist/ws/jaxme/source/ws-${P}-src.tar.gz;name=archive \ - http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2;name=ant \ - " - -# do_compile: -# 2. ERROR in src/jaxme/org/apache/ws/jaxme/generator/XJCTask.java (at line 30) -# import org.apache.ws.jaxme.generator.sg.SGFactoryChain; -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -# The import org.apache.ws.jaxme.generator.sg.SGFactoryChain cannot be resolved -# ---------- -# 3. ERROR in src/jaxme/org/apache/ws/jaxme/generator/XJCTask.java (at line 1055) -# if (!SGFactoryChain.class.isAssignableFrom(c)) { -# ^^^^^^^^^^^^^^ -# SGFactoryChain cannot be resolved to a type -# ---------- -# ... and many more -PNBLACKLIST[jaxme] ?= "BROKEN: do_compile fails" - -S = "${WORKDIR}/ws-${P}" - -inherit java-library - -DEPENDS = "fastjar-native log4j1.2 xerces-j xalan-j commons-codec hsqldb antlr antlr-native" - -do_compile() { - oe_makeclasspath cp -s log4j-1.2 xercesImpl xalan2 commons-codec hsqldb antlr - cp=build-api:build-jaxme:build-js:build-xs:build-pm:$cp - - jaxme_build src/api build-api $cp jaxmeapi-${PV}.jar - - runantlr -o src/js/org/apache/ws/jaxme/js/jparser src/js/org/apache/ws/jaxme/js/jparser/java15.g - jaxme_build src/js build-js $cp jaxmejs-${PV}.jar - - jaxme_build src/xs build-xs $cp jaxmexs-${PV}.jar - - jaxme_build src/jaxme build-jaxme $cp ${JARFILENAME} - -# jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar -} - -do_install_append() { - oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar - oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar - oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar - oe_jarinstall jaxmepm-${PV}.jar jaxmepm.jar -} - -# Compile helper -# 1 - source dir -# 2 - dest dir -# 3 - classpath -# 4 - jar file name -jaxme_build() { - mkdir -p $2 - - ant_sourcepath=${WORKDIR}/apache-ant-1.7.1/src/main - - echo "javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 \`find $1 -name "*.java"\`" - javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 `find $1 -name "*.java" -and -not \( -wholename "*junit*" -or -wholename "*examples*" \) ` - (cd $1 && find . -name "*.properties" -exec cp {} ${S}/$2/{} \;) - - rm -rf $2/org/apache/tools - - fastjar -C $2 -c -f $4 . -} - -SRC_URI[archive.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4" -SRC_URI[archive.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc" -SRC_URI[ant.md5sum] = "0d68db4a1ada5c91bcbf53cefd0c2fd7" -SRC_URI[ant.sha256sum] = "4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6" diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb b/recipes-core/xml-commons/jdom_1.1.3.bb index df9125d..acd2ae1 100644 --- a/recipes-core/xml-commons/jdom_1.1.3.bb +++ b/recipes-core/xml-commons/jdom_1.1.3.bb @@ -1,7 +1,7 @@ SUMMARY = "Parses, manipulates, and outputs XML using standard Java constructs" DESCRIPTION = "JDOM aims to provide a complete, Java-based solution for \ accessing, manipulating, and outputting XML data from Java code." -LICENSE = "BSD" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=897c700e4c122d8f4ef8f6d253a6f744" HOMEPAGE = "http://jdom.org/" diff --git a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb index 42ce703..b5d13cd 100644 --- a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb +++ b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" PR = "r1" LIC_FILES_CHKSUM = "file://LICENSE.resolver.txt;md5=d229da563da18fe5d58cd95a6467d584" -SRC_URI = "http://archive.apache.org/dist/xml/commons/xml-commons-resolver-${PV}.tar.gz" +SRC_URI = "https://archive.apache.org/dist/xml/commons/binaries/xml-commons-resolver-${PV}.tar.gz" inherit java-library diff --git a/recipes-core/xml-commons/xom_1.2.10.bb b/recipes-core/xml-commons/xom_1.2.10.bb index 8b43c39..9b09e4d 100644 --- a/recipes-core/xml-commons/xom_1.2.10.bb +++ b/recipes-core/xml-commons/xom_1.2.10.bb @@ -14,7 +14,7 @@ PV_jaxen = "1.1.6" SRC_URI = "\ http://www.cafeconleche.org/XOM/${P}-src.tar.gz;name=archive \ - git://github.com/codehaus/${SRCNAME_jaxen};name=jaxen \ + git://github.com/codehaus/${SRCNAME_jaxen};name=jaxen;branch=master;protocol=https \ file://04_remove_sun_import.patch \ " SRC_URI[archive.md5sum] = "9f3a2ae827a9f6826fe76e4b7b0c22b3" @@ -36,7 +36,7 @@ do_move_jaxen() { } -addtask move_jaxen after do_removebinaries before do_patch +addtask move_jaxen after do_deletebinaries before do_patch do_compile() { mkdir -p build diff --git a/recipes-core/xml-commons/xpp2_2.1.10.bb b/recipes-core/xml-commons/xpp2_2.1.10.bb index 6fc81a2..a76cc4e 100644 --- a/recipes-core/xml-commons/xpp2_2.1.10.bb +++ b/recipes-core/xml-commons/xpp2_2.1.10.bb @@ -1,5 +1,5 @@ SUMMARY = "Streaming pull XML parser for java" -LICENSE = "BSD-like" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d40c660a53e36a103a35c170d38d0ef6" HOMEPAGE = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/" diff --git a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb index 1f02cb7..09ef1f1 100644 --- a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb +++ b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb @@ -1,5 +1,5 @@ SUMMARY = "Streaming pull XML parser for Java (3rd edition)" -LICENSE = "BSD-like" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=35235e1ea47db355da0627f8d93e3a6c" HOMEPAGE = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1" @@ -39,11 +39,11 @@ do_compile() { fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar . } -do_install_append() { +do_install:append() { oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar } -FILES_libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*" +FILES:libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*" SRC_URI[md5sum] = "e1b6aeaad1cd06e64568aae1a507d5c6" diff --git a/recipes-extended/dbus/dbus-java_2.7.bb b/recipes-extended/dbus/dbus-java_2.7.bb index dfd2ff1..0e5ae92 100644 --- a/recipes-extended/dbus/dbus-java_2.7.bb +++ b/recipes-extended/dbus/dbus-java_2.7.bb @@ -1,15 +1,15 @@ SUMMARY = "A pure Java D-Bus Implementation" -SUMMARY_${PN}-viewer = "${SUMMARY} (DBusViewer Binary)" -SUMMARY_${PN}-bin = "${SUMMARY} (Binaries)" +SUMMARY:${PN}-viewer = "${SUMMARY} (DBusViewer Binary)" +SUMMARY:${PN}-bin = "${SUMMARY} (Binaries)" AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" SECTION = "libs" LICENSE = "LGPL-2.1 & AFL-2.1" DEPENDS = "libmatthew gettext-native fastjar-native" -RDEPENDS_${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-debug-java ${JPN}" -RDEPENDS_${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" -RSUGGESTS_${JPN} = "libunixsocket-java" +RDEPENDS:${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-debug-java ${JPN}" +RDEPENDS:${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" +RSUGGESTS:${JPN} = "libunixsocket-java" PR = "r1" @@ -25,6 +25,8 @@ S = "${WORKDIR}/dbus-java-${PV}" inherit java-library +include recipes-core/classpath/classpath-features-check.inc + # jamvm-native unfortunately contains non-generificed java/lang/reflect classes # which are accessed in this package. Work around this by setting the bootclasspath # explicitly. @@ -73,5 +75,5 @@ do_install () { # and dbus-bin*.jar PACKAGES = "${PN}-viewer ${PN}-bin ${JPN}" -FILES_${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" -FILES_${PN}-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" +FILES:${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" +FILES:${PN}-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb b/recipes-extended/rxtx/rxtx_2.2.0.bb index 87d84a8..27935bc 100644 --- a/recipes-extended/rxtx/rxtx_2.2.0.bb +++ b/recipes-extended/rxtx/rxtx_2.2.0.bb @@ -27,7 +27,7 @@ SRC_URI[sha256sum] = "3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880 S = "${WORKDIR}/rxtx-2.2pre2" -INSANE_SKIP_${JPN} += "dev-so" +INSANE_SKIP:${JPN} += "dev-so" PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit autotools-brokensep java-library remove-libtool @@ -36,7 +36,7 @@ JARFILENAME = "RXTXcomm.jar" EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \ JHOME=${D}${datadir_java}/ext" -do_configure_prepend() { +do_configure:prepend() { # Ugly but don't complain to me, but upstream ;-) sed -e 's,bin/javah,bin/gjavah,g' \ -e 's,bin/jar,bin/fastjar,g' \ @@ -47,16 +47,16 @@ do_configure_prepend() { ${S}/ltmain.sh } -do_install_prepend() { +do_install:prepend() { install -d ${D}${libdir_jni} install -d ${D}${datadir_java}/ext } -PACKAGES_remove = "${PN}" +PACKAGES:remove = "${PN}" -FILES_${JPN} += "${libdir_jni}" -RPROVIDES_${JPN} = "${PN}" -RCONFLICTS_${JPN} = "${PN}" -RREPLACES_${JPN} = "${PN}" +FILES:${JPN} += "${libdir_jni}" +RPROVIDES:${JPN} = "${PN}" +RCONFLICTS:${JPN} = "${PN}" +RREPLACES:${JPN} = "${PN}" -FILES_${PN}-dbg += "${libdir_jni}/.debug" +FILES:${PN}-dbg += "${libdir_jni}/.debug" diff --git a/recipes-images/images/openjdk-7-test-image.bb b/recipes-images/images/openjdk-7-test-image.bb index 1e6d734..4251da3 100644 --- a/recipes-images/images/openjdk-7-test-image.bb +++ b/recipes-images/images/openjdk-7-test-image.bb @@ -1,3 +1,3 @@ -IMAGE_INSTALL_append = " openjdk-7-jdk " +IMAGE_INSTALL:append = " openjdk-7-jdk " inherit openjdk-test-image diff --git a/recipes-images/images/openjdk-8-test-image.bb b/recipes-images/images/openjdk-8-test-image.bb index d2eb040..3216040 100644 --- a/recipes-images/images/openjdk-8-test-image.bb +++ b/recipes-images/images/openjdk-8-test-image.bb @@ -1,3 +1,3 @@ -IMAGE_INSTALL_append = " openjdk-8 " +IMAGE_INSTALL:append = " openjdk-8 " inherit openjdk-test-image diff --git a/recipes-images/images/openjre-7-test-image.bb b/recipes-images/images/openjre-7-test-image.bb index 2616255..ced320b 100644 --- a/recipes-images/images/openjre-7-test-image.bb +++ b/recipes-images/images/openjre-7-test-image.bb @@ -1,3 +1,3 @@ -IMAGE_INSTALL_append = " openjdk-7-jre " +IMAGE_INSTALL:append = " openjdk-7-jre " inherit openjre-test-image diff --git a/recipes-images/images/openjre-8-test-image.bb b/recipes-images/images/openjre-8-test-image.bb index e722ec3..f95098b 100644 --- a/recipes-images/images/openjre-8-test-image.bb +++ b/recipes-images/images/openjre-8-test-image.bb @@ -1,3 +1,3 @@ -IMAGE_INSTALL_append = " openjre-8 " +IMAGE_INSTALL:append = " openjre-8 " inherit openjre-test-image |