diff options
Diffstat (limited to 'recipes-core/openjdk')
55 files changed, 838 insertions, 751 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index c87266d..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" @@ -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 d774cc2..57827d9 100644 --- a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb +++ b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb @@ -80,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 0ef4750..82bf31e 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc @@ -12,7 +12,6 @@ FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:" # for weird openjdk-common.inc S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}" -export TOPDIR="${S}" SRC_URI = "\ ${OPENJDK_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,8 +168,8 @@ 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_unpack[postfuncs] += "do_unpack_extract_submodules" +#do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" export DEBUG_BINARIES = "true" @@ -161,22 +177,23 @@ ALTERNATIVE_PRIORITY = "50" OPENJDK_UPDATE_VERSION = "${PV}" OPENJDK_BUILD_NUMBER = "ga" -EXTRA_OECONF_append = "\ +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" -FLAGS_GCC9 = "-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 6c0f949..ff682f1 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc @@ -47,16 +47,13 @@ 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 \ " -BUILD_CFLAGS_append = " -Wno-stringop-overflow -Wno-error" -TARGET_CFLAGS_append = " -Wno-stringop-overflow -Wno-error" - -EXTRA_OECONF_append = "\ +EXTRA_OECONF:append = "\ --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ \ --with-tools-dir=${STAGING_DIR_NATIVE} \ @@ -76,16 +73,16 @@ EXTRA_OECONF_append = "\ ${@jdk_configure_options(d)} \ " -do_configure_prepend() { +do_configure:prepend() { export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" export ${@jdk_environment_options(d)} } -do_configure_append() { +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 | \ @@ -102,10 +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" -EXTRA_OEMAKE_append = '\ +EXTRA_OEMAKE:append = '\ ${@jdk_make_options(d)} \ ALT_SDT_H="${STAGING_INCDIR}" \ ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ @@ -133,4 +132,4 @@ PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" # 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" +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 321a43d..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,7 +17,7 @@ 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-tools-dir=${STAGING_DIR_NATIVE} \ @@ -32,36 +32,36 @@ EXTRA_OECONF_append = "\ " # --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") @@ -88,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_242.bb b/recipes-core/openjdk/openjdk-8-native_272.bb index 39321f2..39321f2 100644 --- a/recipes-core/openjdk/openjdk-8-native_242.bb +++ b/recipes-core/openjdk/openjdk-8-native_272.bb diff --git a/recipes-core/openjdk/openjdk-8-release-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-aarch32.inc index 686b562..17e3a3d 100644 --- a/recipes-core/openjdk/openjdk-8-release-aarch32.inc +++ b/recipes-core/openjdk/openjdk-8-release-aarch32.inc @@ -1,47 +1,39 @@ require openjdk-8-release-common.inc COMPATIBLE_HOST = "^$" -COMPATIBLE_HOST_armv7a = "arm" -COMPATIBLE_HOST_armv7ve = "arm" +COMPATIBLE_HOST:armv7a = "arm" +COMPATIBLE_HOST:armv7ve = "arm" -CHANGESET_ID="200120" +CHANGESET_ID="b09-aarch32-20200929" -CORBA_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[corba.md5sum] = "2abf6d5394d9c5310af1e4ca6cec4355" -SRC_URI[corba.sha256sum] = "52e83dfa2fa4fcc8c71f3b2959cca2136099b9c575d3726148c02b9cf7d06324" +CORBA_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[corba.sha256sum] = "3675f043479c7e3ee7128651527d15c4e56f72d22dd953b8d0d8e5c9a2c68741" -HOTSPOT_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[hotspot.md5sum] = "e252af6c20d6190e0613f39c6066e3cc" -SRC_URI[hotspot.sha256sum] = "bfff2ef23ee80acd73a0774e7011028c3598e75d2ee8b3271524ec8ea54801ae" +HOTSPOT_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[hotspot.sha256sum] = "d5ea125d7e54fd3dd21bf1654c09b5ce17497d9327f770abd56ad1108a337b81" -JAXP_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[jaxp.md5sum] = "56dc7a99589582b18bbbb5c4464022c8" -SRC_URI[jaxp.sha256sum] = "430e49ba485737c02312557f4deb8562853e58be19ed175ea63b396307f140ce" +JAXP_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jaxp.sha256sum] = "a025f9f047bc50947aa631641b2f836c3a3ec4a5f2c9019bc7b11ab8444f7b9e" -JAXWS_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[jaxws.md5sum] = "2bbcba759f24f5dcec0c33cd62382e4f" -SRC_URI[jaxws.sha256sum] = "c350716ff8782cc311ca17450e2d198d707d3fb71de9dc3394df39766979559f" +JAXWS_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jaxws.sha256sum] = "ad921e0f5cafab4c5b4bb248ea59bf1615864c4de17bfd7321759d063398dc3f" -JDK_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[jdk.md5sum] = "e17f3f4ea8a409e4a1b09a12b3b5309d" -SRC_URI[jdk.sha256sum] = "dfa4a7e7f8ab8daf34343b1c33544b6209e422c74d5be1dbbd8ef80e2365c8aa" +JDK_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jdk.sha256sum] = "835e81fc88b8c0e40df0d89be5d8a852638b3f5f29acad6997cbc36a2e8341fe" -LANGTOOLS_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[langtools.md5sum] = "06ca78c1d4e058f277876f4e6177d9b0" -SRC_URI[langtools.sha256sum] = "59ccafa433f5510c91835efcafbe9ff9c707034ec3305dc3a4c1a85fac65ab0c" +LANGTOOLS_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[langtools.sha256sum] = "554491026bb9fadb837d635d4beea3ca9cb73f034c1379d57fcd77787816139f" -NASHORN_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[nashorn.md5sum] = "1958e204f3984abeb2cf9e7c57aa7839" -SRC_URI[nashorn.sha256sum] = "e964721e539807a38bdcbce7259d235f873974a686badbc274b7368a288f0021" +NASHORN_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[nashorn.sha256sum] = "8358000a7e52fcfd046027319569d17f2e99b710acbfd1a1120b50ce93afe223" -OPENJDK_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[openjdk.md5sum] = "9aceb3b4cd710cdda55be4fe6a5303c9" -SRC_URI[openjdk.sha256sum] = "9691291b26a650d854ce0feacf32dfb3b956165c5d2db6e1ff46dd44f4c517cf" +OPENJDK_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[openjdk.sha256sum] = "4b38e672c82df5d18215849829a80a111b1c7b46567bc641e9fec92bedd0d32a" -PACKAGECONFIG_append_armv7a = " client" -PACKAGECONFIG_append_armv7ve = " client" +PACKAGECONFIG:append:armv7a = " client" +PACKAGECONFIG:append:armv7ve = " client" -do_install_append() { +do_install:append() { if [ -d ${D}${JDK_HOME} ] ; then sed -e 's,^\(-server ERROR$\),# \1,' \ -e 's,^-client IGNORE,-client ERROR,' \ @@ -56,5 +48,5 @@ do_install_append() { fi } -JDK_ARCH_armv7a = "aarch32" -JDK_ARCH_armv7ve = "aarch32" +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 index d08892d..3aac110 100644 --- a/recipes-core/openjdk/openjdk-8-release-aarch64.inc +++ b/recipes-core/openjdk/openjdk-8-release-aarch64.inc @@ -2,36 +2,28 @@ require openjdk-8-release-common.inc COMPATIBLE_HOST = "aarch64" -CHANGESET_ID="b07" +CHANGESET_ID="b10" -CORBA_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[corba.md5sum] = "d6dfd6f0c3bf4c6dc1f867dc7bcf8730" -SRC_URI[corba.sha256sum] = "e80dae94f21ca9de2269bc9de72f1098d417e9f7d6ff69d047e26669e31b1bc4" +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.md5sum] = "44731f82f6e2a0697f414ae62f9eff54" -SRC_URI[hotspot.sha256sum] = "3acb0bfa3eda0137e3c70ab10b59f139e0720116ed6ecf3f9c8633ebc36947b1" +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.md5sum] = "7fb4207ba9277e109439101961223fc7" -SRC_URI[jaxp.sha256sum] = "22616e56825c611c70968c34a229661d4cb910fdb0c3936ae3c75de2330abfb5" +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.md5sum] = "a27379cbd6253408eee4aa0b8a551042" -SRC_URI[jaxws.sha256sum] = "b6eb69d867694002284712a28058770170d885e6de6872cba260061d001b77ae" +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.md5sum] = "2e64397ef1f35309aa7de00d46c2c751" -SRC_URI[jdk.sha256sum] = "d470d24eddc314e5c30035881f3af6f0c48a3360accc0644ec26d9d32d9ea0e6" +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.md5sum] = "71c2ce819538b0acc443c0519dfa43c1" -SRC_URI[langtools.sha256sum] = "219919b7980d863cc26abd87341012f4802dd12a11a45f6627309ec365a9e838" +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.md5sum] = "6ee9418598ca411fe0b2339fa1a3a272" -SRC_URI[nashorn.sha256sum] = "6d86c23301d2cbc1ea72474730336e089eb4c3d3014bdf0f3a9d3b5976a75f58" +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.md5sum] = "188b5d7ef0976cfc1a4258d1dc8ccce0" -SRC_URI[openjdk.sha256sum] = "7c32399a85f56bda2c740fc6834b8b5d648e75271a5376c2fa968bd713e3fec8" +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 index bd3092f..ff8d96e 100644 --- a/recipes-core/openjdk/openjdk-8-release-common.inc +++ b/recipes-core/openjdk/openjdk-8-release-common.inc @@ -1,3 +1,4 @@ + PATCHES_URI = "\ file://0001-Allow-using-a-system-installed-libjpeg.patch \ file://0002-Allow-using-a-system-installed-libpng.patch \ @@ -9,6 +10,7 @@ PATCHES_URI = "\ 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 \ @@ -18,38 +20,35 @@ PATCHES_URI = "\ 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-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.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-backport-patch-to-fix-misuses-of-strncpy-str.patch \ - file://1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ - file://1006-hotspot-Zero-build-requires-disabled-warnings.patch \ - file://1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ - file://1008-hotspot-Turn-on-the-Wreturn-type-warning.patch \ - file://1009-hotspot-handle-format-error-for-GCC-7.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://1010-hotspot-fix-adlc-flags.patch \ - file://1011-hotspot-fix-shark-build-common.patch \ - file://1012-hotspot-restrict-to-staging-dir.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://aarch64-hotspot-Fix-further-functions-with-a-missing.patch \ +HOTSPOT_UB_PATCH:prepend:aarch64 = "\ + file://1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch \ " -HOTSPOT_UB_PATCH_append_armv7a = " file://aarch32-hotspot-fix-missing-return-values.patch" -HOTSPOT_UB_PATCH_append_armv7ve = " file://aarch32-hotspot-fix-missing-return-values.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 = "\ - ${FIX_SHARK_BUILD_PT2_PATCH} \ +PATCHES_URI:append:class-target = "\ + file://1013-hotspot-add-missing-includes-for-shark-build-pt2.patch \ " -FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" -FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0" -FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0" -PATCHES_URI_append_libc-musl = "\ +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 \ @@ -63,55 +62,45 @@ PATCHES_URI_append_libc-musl = "\ 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 = "" +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" +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" +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://aarch32-hotspot-remaining-musl-fixes.patch" -PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch" -PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.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-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" -PATCHES_URI_remove_armv7ve = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" -PATCHES_URI_remove_aarch64 = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" +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" - -# 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" +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" +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_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_U:aarch64 = "jdk8u-shenandoah" OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" diff --git a/recipes-core/openjdk/openjdk-8-release.inc b/recipes-core/openjdk/openjdk-8-release.inc index 170338f..4cdd050 100644 --- a/recipes-core/openjdk/openjdk-8-release.inc +++ b/recipes-core/openjdk/openjdk-8-release.inc @@ -3,37 +3,29 @@ 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 = "^$" +COMPATIBLE_HOST:armv7a = "^$" +COMPATIBLE_HOST:armv7ve = "^$" CORBA_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[corba.md5sum] = "e269b1b01c00bec6c9f2684d7e3e6540" -SRC_URI[corba.sha256sum] = "45433c179dd5ee117b8097c75f475feb5a2d2fae052be3e582c59511696a5d0e" +SRC_URI[corba.sha256sum] = "28c487a49546ab1a592eaf229c13e1896b390958ac4e6fa19bf5da34a1977138" HOTSPOT_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[hotspot.md5sum] = "105c2a6bdfecc2f1fe09aac65748bf47" -SRC_URI[hotspot.sha256sum] = "08729033233b3a42bf1fa3d2a2c0cdf1c950c682cc27bd486f7c19ae28d34ef7" +SRC_URI[hotspot.sha256sum] = "55db6eb423445978e5a9a285c5adea238dec3d3998dc5f1216f8f5c7a8d7c5ea" JAXP_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[jaxp.md5sum] = "a9fb321b6c466e83b9ad23da0d9674c5" -SRC_URI[jaxp.sha256sum] = "8e52661976169fca3fe567b269be5852dff378cb2e66e9f8a4e9f40aaa8d89e4" +SRC_URI[jaxp.sha256sum] = "778d3946b9cf84c9b7fd937dc91d0e919ba7616cc4e3db44b9d0347ecdad308a" JAXWS_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[jaxws.md5sum] = "6ee14ea4974b93bff075499cd820413b" -SRC_URI[jaxws.sha256sum] = "95a14275db59e0c1a8fa4ca4861b8761b1598f0ed7f3ef2f2cef7c619df1eb83" +SRC_URI[jaxws.sha256sum] = "a46eabbed4fedcdbd26510fc1ccf40aaa337e44542f112d4dba3e93f2bb7e492" JDK_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[jdk.md5sum] = "57d2bc331d9506fa652fac686c6b64c1" -SRC_URI[jdk.sha256sum] = "3ecb62288df04d05f541a26da32464c04558a951b2962290f08b149d614ae020" +SRC_URI[jdk.sha256sum] = "9913adf85d3c5b039a5dfeb0962613d92c6f454d0bbbbe3e5341e221021e908e" LANGTOOLS_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[langtools.md5sum] = "5456b86c13a21c8e73a088af5723ba06" -SRC_URI[langtools.sha256sum] = "ffaf18753935cd03b2d581f17789172f4cfdc093d62ca764bf14068d7e30599c" +SRC_URI[langtools.sha256sum] = "9189920ae3858c9a680912c54504302e0553cf25d892c8a03fe954859f587066" NASHORN_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[nashorn.md5sum] = "0716fb438451ac45285a0cd8c17cc27b" -SRC_URI[nashorn.sha256sum] = "3a572a5d5c2e8b590c9ac2c65905069a991f7e168f5bbe15e7dbb924b10ab96d" +SRC_URI[nashorn.sha256sum] = "b42bed287349ecc702f874867a60c3e3664a799d69004e46260db5ff9a7df772" OPENJDK_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[openjdk.md5sum] = "5f5cf2638bba1b4f9b4915be9973077e" -SRC_URI[openjdk.sha256sum] = "633f1d20d4d8d36fea1680140b5514ab153096a19c306b812fbbd19314c8dece" +SRC_URI[openjdk.sha256sum] = "3b335df278915237986ccdfc40e262d5b6a711072b2a0b99bf2b197dc9ff0cff" diff --git a/recipes-core/openjdk/openjdk-8_242.bb b/recipes-core/openjdk/openjdk-8_272.bb index bc6ce51..0bfa102 100644 --- a/recipes-core/openjdk/openjdk-8_242.bb +++ b/recipes-core/openjdk/openjdk-8_272.bb @@ -1,7 +1,7 @@ INC_FILE_SUFFIX = "" -INC_FILE_SUFFIX_aarch64 = "-aarch64" -INC_FILE_SUFFIX_armv7a = "-aarch32" -INC_FILE_SUFFIX_armv7ve = "-aarch32" +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 @@ -14,12 +14,12 @@ do_install() { 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_242.bb b/recipes-core/openjdk/openjre-8_272.bb index ce6392a..c1789aa 100644 --- a/recipes-core/openjdk/openjre-8_242.bb +++ b/recipes-core/openjdk/openjre-8_272.bb @@ -1,7 +1,7 @@ INC_FILE_SUFFIX = "" -INC_FILE_SUFFIX_aarch64 = "-aarch64" -INC_FILE_SUFFIX_armv7a = "-aarch32" -INC_FILE_SUFFIX_armv7ve = "-aarch32" +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 @@ -13,14 +13,14 @@ do_install() { install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ } -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/ \ @@ -28,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-8/0001-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch index e9662eb..00ce23f 100644 --- 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 @@ -1,7 +1,7 @@ -From 836aad60652299a26341b46a4a9a2e6c418b6947 Mon Sep 17 00:00:00 2001 +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 01/10] Allow using a system-installed libjpeg +Subject: [PATCH] Allow using a system-installed libjpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -22,12 +22,13 @@ 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 6d803f9..d2732eb 100644 +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], @@ -72,6 +73,3 @@ index 6d803f9..d2732eb 100644 AC_SUBST(USE_EXTERNAL_LIBJPEG) ############################################################################### --- -2.24.1 - 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 index ed8ecfa..64f4bce 100644 --- 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 @@ -1,7 +1,7 @@ -From ed79dc49323cc08e81b3699817825f66b1af0ce2 Mon Sep 17 00:00:00 2001 +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 02/10] Allow using a system-installed libpng +Subject: [PATCH] Allow using a system-installed libpng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -19,12 +19,13 @@ 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 d2732eb..727f018 100644 +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], @@ -75,6 +76,3 @@ index d2732eb..727f018 100644 ############################################################################### # # Check for the zlib library --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/0003-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 0e3359c..0ab4b7d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch @@ -1,7 +1,7 @@ -From 4cde9ea2adf8c57168a299f11625083d1822b0de 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 03/10] build: fix build on --as-needed toolchains (generic) +Subject: [PATCH] build: fix build on --as-needed toolchains (generic) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -66,12 +66,13 @@ all. Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- 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 d961cf3..92f8033 100644 +index d961cf35..92f8033f 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -618,9 +618,8 @@ endif # no MacOS X support yet @@ -86,6 +87,3 @@ index d961cf3..92f8033 100644 ifneq (,$$($1_GEN_MANIFEST)) $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 endif --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch index db00b24..eab00d2 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch @@ -1,15 +1,16 @@ -From f4c93547119c7550626e1b2ae2b750ea4f83b3fe Mon Sep 17 00:00:00 2001 +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 04/10] don't expect fqpn for make +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 4ee9cdd..c20ea76 100644 +index 4ee9cdd1..c20ea765 100644 --- a/common/autoconf/basics.m4 +++ b/common/autoconf/basics.m4 @@ -740,10 +740,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], @@ -28,6 +29,3 @@ index 4ee9cdd..c20ea76 100644 if test "x$FOUND_MAKE" = x; then AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.]) fi --- -2.24.1 - 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 index 262f0b7..1a0f6e3 100644 --- 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 @@ -1,15 +1,16 @@ -From b8bab47b58be4a0102011825c2ee3dd2c6427d08 Mon Sep 17 00:00:00 2001 +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 05/10] autoconf: filter aclocal copy too +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 c20ea76..8e06cd2 100644 +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], @@ -20,6 +21,3 @@ index c20ea76..8e06cd2 100644 -e 's/ //g' \ | $TR -d '\n'` if test "x$filtered_files" != x; then --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch index c5fa4bf..d24ed71 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch @@ -1,19 +1,20 @@ -From cf40c00dfd6d2299055c0e8415525d2da5e7cd4a Mon Sep 17 00:00:00 2001 +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 06/10] autoconf: handle extra output +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. 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 5be15b8..0d1a6e1 100644 +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], @@ -25,6 +26,3 @@ index 5be15b8..0d1a6e1 100644 # Extra M4 quote needed to protect [] in grep expression. [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] --- -2.24.1 - 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 index c99d599..b7e84b2 100644 --- 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 @@ -1,7 +1,7 @@ -From ec3aa8ae1159ff5ef37fae1ba470cf1886aa8d79 Mon Sep 17 00:00:00 2001 +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 07/10] fix assembler flag handling in makefile +Subject: [PATCH] fix assembler flag handling in makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,12 +14,13 @@ 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 92f8033..46a1be9 100644 +index 92f8033f..46a1be91 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -391,7 +391,7 @@ define SetupNativeCompilation @@ -31,6 +32,3 @@ index 92f8033..46a1be9 100644 # On windows we need to create a resource file ifeq ($(OPENJDK_TARGET_OS), windows) --- -2.24.1 - 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 index b783613..9cf468e 100644 --- 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 @@ -1,15 +1,16 @@ -From c530da1c0269d1e9a875670943446876227fdb71 Mon Sep 17 00:00:00 2001 +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 08/10] autoconf: fix shark build (common) +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 727f018..91d2b5c 100644 +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], @@ -32,6 +33,3 @@ index 727f018..91d2b5c 100644 if echo "${flag}" | grep -q '^-l'; then if test "${LLVM_LIBS}" != ""; then LLVM_LIBS="${LLVM_LIBS} " --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch index 14fccd1..ff6180f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch @@ -1,16 +1,16 @@ -From a5f2646a9dd0f7191e9e0aa5eba5fdd9d70d1671 Mon Sep 17 00:00:00 2001 +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 09/10] prevent debuginfo in favour of openembedded package - split +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 46a1be9..b4ea2c6 100644 +index 46a1be91..b4ea2c6f 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -456,67 +456,6 @@ define SetupNativeCompilation @@ -149,6 +149,3 @@ index 46a1be9..b4ea2c6 100644 endif endif --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch index 57099ec..ff9346c 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch @@ -1,15 +1,16 @@ -From 0d22dccb4de73d274b90e2647702b92958374bc1 Mon Sep 17 00:00:00 2001 +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 10/10] autoconf: remove shell variables from autoheader +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 8e06cd2..c220bba 100644 +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], @@ -41,6 +42,3 @@ index 8e06cd2..c220bba 100644 ]) AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], --- -2.24.1 - 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 index f1de194..88d2192 100644 --- 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 @@ -1,5 +1,20 @@ +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 e3a82c8..705e3e7 100644 +index c0a4af5..28da6ea 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -478,23 +478,30 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], @@ -41,3 +56,6 @@ index e3a82c8..705e3e7 100644 else # No user supplied value. Locate compiler ourselves. +-- +2.26.2 + 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 index 39179d4..fc8fca5 100644 --- 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 @@ -1,5 +1,17 @@ +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 d961cf3..9679f97 100644 +index b4ea2c6..01082f5 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -383,10 +383,6 @@ define SetupNativeCompilation @@ -22,3 +34,6 @@ index d961cf3..9679f97 100644 $1 := $$($1_TARGET) ifneq (,$$($1_LIBRARY)) # Generating a dynamic library. +-- +2.26.2 + 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/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch index 280ee60..b2e50e0 100644 --- 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 @@ -1,7 +1,7 @@ -From 5e8080a8dd56205f550f7c490f864c95dc8e509b Mon Sep 17 00:00:00 2001 +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/1012] hotspot: fix crash on JNI_CreateJavaVM +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() @@ -19,10 +19,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 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 03cabfefb..4f28cc1fb 100644 +index c477851c1..47eef1e7c 100644 --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp -@@ -3192,7 +3192,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) { +@@ -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]; @@ -33,5 +33,5 @@ index 03cabfefb..4f28cc1fb 100644 stack_extent = (uintptr_t) get_stack_commited_bottom( os::Linux::initial_thread_stack_bottom(), -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch index 3f678dd..7739c8b 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1002-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 df566df123c8af8252c0e113c41c32482834923e 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 1002/1012] 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 @@ -23,15 +23,16 @@ Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - src/os/aix/vm/os_aix.inline.hpp | 2 +- - src/os/bsd/vm/os_bsd.inline.hpp | 2 +- - src/os/linux/vm/os_linux.inline.hpp | 2 +- - src/os/solaris/vm/os_solaris.inline.hpp | 2 +- + hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- + hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- + hotspot/src/os/linux/vm/os_linux.inline.hpp | 2 +- + hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 2 +- 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 421ea342e..9a1e1e096 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 @@ @@ -44,7 +45,7 @@ index 421ea342e..9a1e1e096 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 c35abf486..8ff584aee 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 @@ @@ -57,7 +58,7 @@ index c35abf486..8ff584aee 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 a23bd5631..9d56de0ef 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 @@ @@ -70,7 +71,7 @@ index a23bd5631..9d56de0ef 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 8e095ab69..ce37e9a12 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 @@ @@ -82,6 +83,3 @@ index 8e095ab69..ce37e9a12 100644 #include <sys/filio.h> #include <unistd.h> #include <netdb.h> --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1003-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 8e31461..e0864be 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1003-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 e5bf672f4e10997789f2a447fd95a88703dbd332 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 1003/1012] 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 @@ -20,12 +20,13 @@ Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - src/os/linux/vm/jvm_linux.cpp | 2 ++ + hotspot/src/os/linux/vm/jvm_linux.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/hotspot/src/os/linux/vm/jvm_linux.cpp -index ba84788a1..c22281f7c 100644 +index ba84788a..c22281f7 100644 --- a/hotspot/src/os/linux/vm/jvm_linux.cpp +++ b/hotspot/src/os/linux/vm/jvm_linux.cpp @@ -154,7 +154,9 @@ struct siglabel siglabels[] = { @@ -38,6 +39,3 @@ index ba84788a1..c22281f7c 100644 "CHLD", SIGCHLD, /* Child status has changed (POSIX). */ "CONT", SIGCONT, /* Continue (POSIX). */ "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch deleted file mode 100644 index ad480e3..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 3a6eef99b27b7dd750e7a02eb3ada71db99d9345 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 1004/1012] 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> -Signed-off-by: Richard Leitner <richard.leitner@skidata.com> ---- - agent/src/os/linux/libproc_impl.c | 7 ++++++- - src/share/tools/hsdis/hsdis.c | 1 + - src/share/vm/compiler/compileBroker.hpp | 3 ++- - src/share/vm/compiler/disassembler.cpp | 1 + - src/share/vm/runtime/arguments.cpp | 13 ++++++------- - src/share/vm/utilities/ostream.cpp | 12 ++++++++---- - src/share/vm/utilities/vmError.cpp | 9 +-------- - 7 files changed, 25 insertions(+), 21 deletions(-) - -diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c -index ca791c95d..73a15ce35 100644 ---- a/hotspot/agent/src/os/linux/libproc_impl.c -+++ b/hotspot/agent/src/os/linux/libproc_impl.c -@@ -159,7 +159,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 7bef1040f..1907d479e 100644 ---- a/hotspot/src/share/tools/hsdis/hsdis.c -+++ b/hotspot/src/share/tools/hsdis/hsdis.c -@@ -438,6 +438,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 ad37ff173..16e0ba3aa 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 93cd9e854..e7b32cd6b 100644 ---- a/hotspot/src/share/vm/compiler/disassembler.cpp -+++ b/hotspot/src/share/vm/compiler/disassembler.cpp -@@ -295,6 +295,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 2665b6b8c..5a9294677 100644 ---- a/hotspot/src/share/vm/runtime/arguments.cpp -+++ b/hotspot/src/share/vm/runtime/arguments.cpp -@@ -3455,7 +3455,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--) { -@@ -3834,17 +3834,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 1b00f829a..4daea2b7e 100644 ---- a/hotspot/src/share/vm/utilities/ostream.cpp -+++ b/hotspot/src/share/vm/utilities/ostream.cpp -@@ -342,15 +342,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 ef3bb5cee..c11fef472 100644 ---- a/hotspot/src/share/vm/utilities/vmError.cpp -+++ b/hotspot/src/share/vm/utilities/vmError.cpp -@@ -450,14 +450,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.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1005-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 81177d0..2eba669 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1005-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,8 +1,7 @@ -From bce7b39095a839b8e77fe068e87150e855224705 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 1005/1012] 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 @@ -19,15 +18,16 @@ Upstream-Status: Backport Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - src/share/vm/prims/jvm.cpp | 6 +++--- + 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 f43dc5ed7..8d7523c55 100644 +index c32c98ad..6f2221c4 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp +++ b/hotspot/src/share/vm/prims/jvm.cpp -@@ -908,7 +908,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 @@ -36,7 +36,7 @@ index f43dc5ed7..8d7523c55 100644 #else return false; #endif -@@ -918,7 +918,7 @@ JVM_END +@@ -939,7 +939,7 @@ JVM_END JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)) JVMWrapper("JVM_GetResourceLookupCacheURLs"); #if INCLUDE_CDS @@ -45,7 +45,7 @@ index f43dc5ed7..8d7523c55 100644 #else return NULL; #endif -@@ -928,7 +928,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 @@ -54,6 +54,3 @@ index f43dc5ed7..8d7523c55 100644 #else return NULL; #endif --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch index 38067cb..36eefe5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1006-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 84fc6448f44cd45a5448d0e88df8ccabfa10dcc5 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 1006/1012] 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 @@ -19,15 +19,16 @@ Upstream-Status: Backport Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- - src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- - src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++-- - src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- + 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 525031eb9..d47422b8c 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) { @@ -40,7 +41,7 @@ index 525031eb9..d47422b8c 100644 } diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp -index e23e3eaa9..061ed8ce8 100644 +index e23e3eaa..061ed8ce 100644 --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp @@ -1,5 +1,5 @@ @@ -60,7 +61,7 @@ index e23e3eaa9..061ed8ce8 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 d22ea1141..cbee43baa 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 @@ -61,6 +61,7 @@ address os::current_stack_pointer() { @@ -119,7 +120,7 @@ index d22ea1141..cbee43baa 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 39f77f858..b9c73dc48 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 @@ @@ -136,7 +137,4 @@ index 39f77f858..b9c73dc48 100644 + return false; // silence compile warning } - // These routines are only used on cpu architectures that --- -2.24.1 - + bool pd_get_top_frame_for_profiling(frame* fr_addr, diff --git a/recipes-core/openjdk/patches-openjdk-8/1007-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 6692200..2e32702 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1007-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 996a1e3d53773f41e9098117a69a060722972269 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 1007/1012] 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 @@ -21,13 +21,14 @@ Upstream-Status: Backport Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + - src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + + hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + + hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp -index c857b5526..4aaf78b1d 100644 +index c857b552..4aaf78b1 100644 --- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp +++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp @@ -457,6 +457,7 @@ extern "C" { @@ -39,7 +40,7 @@ index c857b5526..4aaf78b1d 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 cbee43baa..136d4d3de 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" { @@ -50,6 +51,3 @@ index cbee43baa..136d4d3de 100644 } }; #endif // !_LP64 --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1008-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 10dd0f7..b1b59c3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1008-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 2cce90259f9de7b5fba7f3380cdc90b3a586aa75 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 1008/1012] 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 @@ -19,24 +23,25 @@ Upstream-Status: Backport Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - make/linux/makefiles/gcc.make | 2 +- - src/cpu/x86/vm/x86_32.ad | 1 + - src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 + - src/share/vm/classfile/defaultMethods.cpp | 4 ++-- - src/share/vm/classfile/symbolTable.cpp | 4 ++-- - src/share/vm/classfile/systemDictionary.cpp | 6 +++--- - src/share/vm/memory/heapInspection.hpp | 2 +- - src/share/vm/memory/metaspaceShared.hpp | 2 +- - src/share/vm/oops/constantPool.hpp | 2 +- - src/share/vm/prims/jvm.cpp | 2 +- - src/share/vm/runtime/reflection.cpp | 2 +- - src/share/vm/runtime/sharedRuntime.cpp | 2 +- - src/share/vm/services/memTracker.hpp | 2 +- + hotspot/make/linux/makefiles/gcc.make | 2 +- + hotspot/src/cpu/x86/vm/x86_32.ad | 1 + + hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 + + hotspot/src/share/vm/classfile/defaultMethods.cpp | 4 ++-- + hotspot/src/share/vm/classfile/symbolTable.cpp | 4 ++-- + hotspot/src/share/vm/classfile/systemDictionary.cpp | 6 +++--- + hotspot/src/share/vm/memory/heapInspection.hpp | 2 +- + hotspot/src/share/vm/memory/metaspaceShared.hpp | 2 +- + hotspot/src/share/vm/oops/constantPool.hpp | 2 +- + hotspot/src/share/vm/prims/jvm.cpp | 2 +- + hotspot/src/share/vm/runtime/reflection.cpp | 2 +- + hotspot/src/share/vm/runtime/sharedRuntime.cpp | 2 +- + hotspot/src/share/vm/services/memTracker.hpp | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make -index 36b3c8ba9..cd9511e50 100644 +index 36b3c8ba..cd9511e5 100644 --- a/hotspot/make/linux/makefiles/gcc.make +++ b/hotspot/make/linux/makefiles/gcc.make @@ -211,7 +211,7 @@ ifeq ($(USE_CLANG), true) @@ -49,7 +54,7 @@ index 36b3c8ba9..cd9511e50 100644 ifeq ($(USE_CLANG),) # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad -index f42d1a288..c8f4ee161 100644 +index f42d1a28..c8f4ee16 100644 --- a/hotspot/src/cpu/x86/vm/x86_32.ad +++ b/hotspot/src/cpu/x86/vm/x86_32.ad @@ -1250,6 +1250,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo @@ -61,7 +66,7 @@ index f42d1a288..c8f4ee161 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 1a7375afc..fbf51b040 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, @@ -73,7 +78,7 @@ index 1a7375afc..fbf51b040 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 4b4b4e250..196622aed 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 @@ -95,7 +100,7 @@ index 4b4b4e250..196622aed 100644 diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp -index ec97077b7..2621a7d62 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) { @@ -117,10 +122,10 @@ index ec97077b7..2621a7d62 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 da2717d36..5253afc22 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)) { @@ -140,7 +145,7 @@ index da2717d36..5253afc22 100644 } diff --git a/hotspot/src/share/vm/memory/heapInspection.hpp b/hotspot/src/share/vm/memory/heapInspection.hpp -index 09ee6602e..c5fec15c3 100644 +index 09ee6602..c5fec15c 100644 --- a/hotspot/src/share/vm/memory/heapInspection.hpp +++ b/hotspot/src/share/vm/memory/heapInspection.hpp @@ -367,7 +367,7 @@ class HeapInspection : public StackObj { @@ -153,7 +158,7 @@ index 09ee6602e..c5fec15c3 100644 private: void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL); diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/hotspot/src/share/vm/memory/metaspaceShared.hpp -index 2f3abae6a..d58ebecb2 100644 +index 2f3abae6..d58ebecb 100644 --- a/hotspot/src/share/vm/memory/metaspaceShared.hpp +++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp @@ -93,7 +93,7 @@ class MetaspaceShared : AllStatic { @@ -166,7 +171,7 @@ index 2f3abae6a..d58ebecb2 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 0698eb40e..354293924 100644 +index 68435471..fad4a92c 100644 --- a/hotspot/src/share/vm/oops/constantPool.hpp +++ b/hotspot/src/share/vm/oops/constantPool.hpp @@ -350,7 +350,7 @@ class ConstantPool : public Metadata { @@ -177,12 +182,12 @@ index 0698eb40e..354293924 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 8d7523c55..4034a8589 100644 +index 6f2221c4..daa69f89 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp +++ b/hotspot/src/share/vm/prims/jvm.cpp -@@ -4343,7 +4343,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( +@@ -4368,7 +4368,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( JVM_DTraceProvider* providers)) JVMWrapper("JVM_DTraceActivate"); return DTraceJSDT::activate( @@ -192,7 +197,7 @@ index 8d7523c55..4034a8589 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 4b39d8ccb..9cd7b0dcb 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, @@ -205,7 +210,7 @@ index 4b39d8ccb..9cd7b0dcb 100644 } diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp -index d5bea29c3..50578ad63 100644 +index d5bea29c..50578ad6 100644 --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp @@ -1041,7 +1041,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, @@ -218,7 +223,7 @@ index d5bea29c3..50578ad63 100644 diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp -index 7ad2b71f4..182084373 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 { @@ -230,6 +235,3 @@ index 7ad2b71f4..182084373 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.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch index ee950cd..e077c53 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch @@ -1,21 +1,22 @@ -From d085dcce6f8700fd8ddda475357496ea6da323dc Mon Sep 17 00:00:00 2001 +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 1009/1012] hotspot: handle format error for GCC >= 7 +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> + --- - src/share/vm/adlc/output_c.cpp | 6 ++++-- + 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 b3766636d..eba08d2f0 100644 +index 19916904..889b785c 100644 --- a/hotspot/src/share/vm/adlc/output_c.cpp +++ b/hotspot/src/share/vm/adlc/output_c.cpp -@@ -436,9 +436,11 @@ static int pipeline_res_mask_initializer( +@@ -419,9 +419,11 @@ static int pipeline_res_mask_initializer( for (i = maxcycleused; i > 0; i /= 10) cycledigit++; @@ -29,6 +30,3 @@ index b3766636d..eba08d2f0 100644 static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; static const char* pipeline_use_element = "Pipeline_Use_Element"; --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch index 03f8660..a68e3a0 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch @@ -1,7 +1,7 @@ -From 89408e465d92657de8c54d4622f1810c28c3d700 Mon Sep 17 00:00:00 2001 +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 1010/1012] hotspot: fix adlc flags +Subject: [PATCH 1009/1013] hotspot: fix adlc flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -39,5 +39,5 @@ index 92b8b9b39..ae0aa0082 100644 # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch index 8fe5489..711d17b 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch @@ -1,7 +1,7 @@ -From 1015cc718ba25cabf613b96fd58baa8dfb8492fe Mon Sep 17 00:00:00 2001 +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 1011/1012] hotspot: fix shark build (common) +Subject: [PATCH 1010/1013] hotspot: fix shark build (common) Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -22,10 +22,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 14 files changed, 123 insertions(+), 12 deletions(-) diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile -index 5765f1e36..f8ff9ecd9 100644 +index de2607c71..3054c3fe8 100644 --- a/hotspot/make/Makefile +++ b/hotspot/make/Makefile -@@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/% +@@ -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) @@ -79,10 +79,10 @@ index 4707cc96e..a2b297ca0 100644 flow_block(blk, temp_vector, temp_set); if (failing()) return; // Watch for bailouts. diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp -index 5253afc22..ecb30cdef 100644 +index df4d56f6f..b1dd335cb 100644 --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp -@@ -2300,6 +2300,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -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)); @@ -90,7 +90,7 @@ index 5253afc22..ecb30cdef 100644 if (!Arguments::is_interpreter_only()) { // Generate a compiled form of the MH intrinsic. AdapterHandlerLibrary::create_native_wrapper(m); -@@ -2309,6 +2310,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -2380,6 +2381,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid "out of space in CodeCache for method handle intrinsic", empty); } } @@ -98,7 +98,7 @@ index 5253afc22..ecb30cdef 100644 // 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. { -@@ -2322,9 +2324,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -2393,9 +2395,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid } assert(spe != NULL && spe->method() != NULL, ""); @@ -444,5 +444,5 @@ index 243183c07..601ca7925 100644 builder()->CreateICmpEQ(lock, check), released_fast, slow_path); -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-restrict-to-staging-dir.patch index b61f664..b5b9471 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-restrict-to-staging-dir.patch @@ -1,7 +1,7 @@ -From e4c080e29afa3f93383c1e046273cd20ec835ca3 Mon Sep 17 00:00:00 2001 +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 1012/1012] hotspot: restrict to staging dir +Subject: [PATCH 1011/1013] hotspot: restrict to staging dir Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -22,5 +22,5 @@ index 386e94b1f..7642a67f8 100644 DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) REASON = "$(SDT_H_FILE) not found" -- -2.24.1 +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/aarch32-hotspot-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/aarch32-hotspot-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/aarch32-hotspot-remaining-musl-fixes.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/aarch32-hotspot-remaining-musl-fixes.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/aarch64-hotspot-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/aarch64-hotspot-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/aarch64-hotspot-remaining-musl-fixes.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/aarch64-hotspot-remaining-musl-fixes.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/2001-jdk-comparison-between-pointer-and-integer.patch b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch index 38d3019..244d2b4 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2001-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 46ea1c28b53bf5fd2be03fa1d78936f6a1e70fc4 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 2001/2008] 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 @@ -21,14 +21,15 @@ Upstream-Status: Backport [http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/90c64359 Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - src/share/native/java/net/net_util.c | 15 +++++++-------- - src/share/native/java/net/net_util.h | 8 ++++---- - 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 b1b8223a6..2eee6261a 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) { @@ -99,7 +100,7 @@ index b1b8223a6..2eee6261a 100644 int scope; diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h -index c8a5e68c4..176ca586e 100644 +index c8a5e68c..176ca586 100644 --- a/jdk/src/share/native/java/net/net_util.h +++ b/jdk/src/share/native/java/net/net_util.h @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); @@ -120,7 +121,7 @@ index c8a5e68c4..176ca586e 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 0a51a365f..dcc348cf1 100644 +index 0a51a365..dcc348cf 100644 --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, @@ -141,6 +142,3 @@ index 0a51a365f..dcc348cf1 100644 ret = NULL; goto cleanupAndReturn; } --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/2002-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 4d1df8a..5f8981d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2002-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 aef9a3f955f6e189b2a24b9f79ccb396275d4fa3 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 2002/2008] 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 @@ -21,8 +21,9 @@ 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> + --- - make/lib/Awt2dLibraries.gmk | 69 +++++++++++++------ + jdk/make/lib/Awt2dLibraries.gmk | 69 +++++++++++++------ .../imageio/plugins/jpeg/JPEGImageReader.java | 2 +- .../imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- .../sun/awt/image/JPEGImageDecoder.java | 2 +- @@ -30,10 +31,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 5 files changed, 51 insertions(+), 26 deletions(-) diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index a06bfd6db..12b9da11d 100644 +index 9368a9d5..7fffcafc 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -695,21 +695,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) +@@ -702,21 +702,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) ########################################################################################## @@ -64,7 +65,7 @@ index a06bfd6db..12b9da11d 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(). -@@ -721,37 +724,50 @@ endif +@@ -728,37 +731,50 @@ endif # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # ifeq ($(CC_43_OR_NEWER), 1) @@ -129,7 +130,7 @@ index a06bfd6db..12b9da11d 100644 ########################################################################################## -@@ -1142,6 +1158,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 @@ -143,7 +144,7 @@ index a06bfd6db..12b9da11d 100644 ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1198,11 +1221,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, \ @@ -160,7 +161,7 @@ index a06bfd6db..12b9da11d 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 8f58f5b3e..fcbab8260 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 { @@ -173,7 +174,7 @@ index 8f58f5b3e..fcbab8260 100644 } }); diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java -index 6a33bd5a1..dca189ed8 100644 +index 6a33bd5a..dca189ed 100644 --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java @@ -177,7 +177,7 @@ public class JPEGImageWriter extends ImageWriter { @@ -186,7 +187,7 @@ index 6a33bd5a1..dca189ed8 100644 } }); diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java -index 872ffc019..5965a186b 100644 +index 872ffc01..5965a186 100644 --- a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java +++ b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java @@ -56,7 +56,7 @@ public class JPEGImageDecoder extends ImageDecoder { @@ -199,7 +200,7 @@ index 872ffc019..5965a186b 100644 } }); diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c -index 7e1d8c99d..8cac61da3 100644 +index 7e1d8c99..8cac61da 100644 --- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c +++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c @@ -51,7 +51,7 @@ @@ -211,6 +212,3 @@ index 7e1d8c99d..8cac61da3 100644 #undef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch index 13d3045..dbc714e 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch @@ -1,7 +1,7 @@ -From bdf8cb302ab7c8f11b676f93da482cd4a9405ce4 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 2003/2008] 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 @@ -18,16 +18,17 @@ 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> + --- - make/lib/Awt2dLibraries.gmk | 12 +++++++++--- + jdk/make/lib/Awt2dLibraries.gmk | 12 +++++++++--- .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index 12b9da11d..cd8b94cd8 100644 +index 7fffcafc..7f42e09c 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -1148,7 +1148,6 @@ endif +@@ -1155,7 +1155,6 @@ endif ifndef BUILD_HEADLESS_ONLY LIBSPLASHSCREEN_DIRS := \ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ @@ -35,7 +36,7 @@ index 12b9da11d..cd8b94cd8 100644 $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen ifeq ($(USE_EXTERNAL_LIBGIF), true) -@@ -1165,6 +1164,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 @@ -49,7 +50,7 @@ index 12b9da11d..cd8b94cd8 100644 ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1222,12 +1228,12 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1229,12 +1235,12 @@ ifndef BUILD_HEADLESS_ONLY LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ @@ -65,7 +66,7 @@ index 12b9da11d..cd8b94cd8 100644 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c -index 3599433e4..5bf002ea1 100644 +index 3599433e..5bf002ea 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c @@ -25,8 +25,7 @@ @@ -78,6 +79,3 @@ index 3599433e4..5bf002ea1 100644 #include <setjmp.h> #define SIG_BYTES 8 --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch index 365b4d6..91ec91f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2004-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 48d7384387394820f2f5e8bdc2982c242568b548 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 2004/2008] 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 @@ -25,24 +25,25 @@ the following command: Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - src/aix/native/java/net/aix_close.c | 2 +- - src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- - src/solaris/native/java/net/PlainSocketImpl.c | 2 +- - src/solaris/native/java/net/bsd_close.c | 2 +- - src/solaris/native/java/net/linux_close.c | 2 +- - src/solaris/native/java/net/net_util_md.h | 2 +- - src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 2 +- - src/solaris/native/sun/nio/ch/Net.c | 2 +- - src/solaris/native/sun/nio/fs/LinuxWatchService.c | 2 +- - src/solaris/transport/socket/socket_md.c | 2 +- + jdk/src/aix/native/java/net/aix_close.c | 2 +- + jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- + jdk/src/solaris/native/java/net/PlainSocketImpl.c | 2 +- + jdk/src/solaris/native/java/net/bsd_close.c | 2 +- + jdk/src/solaris/native/java/net/linux_close.c | 2 +- + jdk/src/solaris/native/java/net/net_util_md.h | 2 +- + jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 2 +- + jdk/src/solaris/native/sun/nio/ch/Net.c | 2 +- + jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 2 +- + jdk/src/solaris/transport/socket/socket_md.c | 2 +- 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 8c070e4b7..126f4d7d4 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> @@ -52,7 +53,7 @@ index 8c070e4b7..126f4d7d4 100644 /* * Stack allocated by thread when doing blocking operation diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c -index 70064b890..c10c602b6 100644 +index 70064b89..c10c602b 100644 --- a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c +++ b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c @@ -34,7 +34,7 @@ @@ -65,7 +66,7 @@ index 70064b890..c10c602b6 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 71cbdf8ce..170957e73 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 @@ @@ -78,10 +79,10 @@ index 71cbdf8ce..170957e73 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 af57cef30..64d040887 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> @@ -91,10 +92,10 @@ index af57cef30..64d040887 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 98e1ce098..85fba135f 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> @@ -104,7 +105,7 @@ index 98e1ce098..85fba135f 100644 /* * Stack allocated by thread when doing blocking operation diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h -index a48446de9..8915b68aa 100644 +index a48446de..8915b68a 100644 --- a/jdk/src/solaris/native/java/net/net_util_md.h +++ b/jdk/src/solaris/native/java/net/net_util_md.h @@ -33,7 +33,7 @@ @@ -117,7 +118,7 @@ index a48446de9..8915b68aa 100644 diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c -index 6860a167b..20849dabc 100644 +index 6860a167..20849dab 100644 --- a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c +++ b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c @@ -28,7 +28,7 @@ @@ -130,7 +131,7 @@ index 6860a167b..20849dabc 100644 #include <sys/time.h> diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c -index 73560ad6c..a3720055c 100644 +index 73560ad6..a3720055 100644 --- a/jdk/src/solaris/native/sun/nio/ch/Net.c +++ b/jdk/src/solaris/native/sun/nio/ch/Net.c @@ -23,7 +23,7 @@ @@ -143,7 +144,7 @@ index 73560ad6c..a3720055c 100644 #include <sys/socket.h> #include <string.h> diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c -index 375aaa485..7606e9ba8 100644 +index 375aaa48..7606e9ba 100644 --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c @@ -32,7 +32,7 @@ @@ -156,7 +157,7 @@ index 375aaa485..7606e9ba8 100644 #include "sun_nio_fs_LinuxWatchService.h" diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c -index 33e062e08..819fcabdb 100644 +index 33e062e0..819fcabd 100644 --- a/jdk/src/solaris/transport/socket/socket_md.c +++ b/jdk/src/solaris/transport/socket/socket_md.c @@ -37,7 +37,7 @@ @@ -168,6 +169,3 @@ index 33e062e08..819fcabdb 100644 #endif #include "socket_md.h" --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch index 32bde99..b38dcb3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2005-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 606c807be8e01a4cc99a02b50717d9bce141e8a2 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 2005/2008] 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 @@ -26,15 +26,16 @@ the following command: Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- - src/macosx/javavm/export/jvm_md.h | 2 +- - src/solaris/javavm/export/jvm_md.h | 2 +- - src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- + jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- + jdk/src/macosx/javavm/export/jvm_md.h | 2 +- + jdk/src/solaris/javavm/export/jvm_md.h | 2 +- + jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c -index c0d585796..c4abb7ae5 100644 +index c0d58579..c4abb7ae 100644 --- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c +++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c @@ -32,7 +32,7 @@ @@ -47,7 +48,7 @@ index c0d585796..c4abb7ae5 100644 /* Also defined in src/aix/native/java/net/aix_close.c */ #define INTERRUPT_SIGNAL (SIGRTMAX - 1) diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h -index 012bb1bab..0b5757683 100644 +index 012bb1ba..0b575768 100644 --- a/jdk/src/macosx/javavm/export/jvm_md.h +++ b/jdk/src/macosx/javavm/export/jvm_md.h @@ -60,7 +60,7 @@ @@ -60,7 +61,7 @@ index 012bb1bab..0b5757683 100644 /* O Flags */ diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h -index 5c681914b..62415ee25 100644 +index 5c681914..62415ee2 100644 --- a/jdk/src/solaris/javavm/export/jvm_md.h +++ b/jdk/src/solaris/javavm/export/jvm_md.h @@ -65,7 +65,7 @@ @@ -73,7 +74,7 @@ index 5c681914b..62415ee25 100644 /* O Flags */ diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c -index 5e2a78b7a..204f0441a 100644 +index 5e2a78b7..204f0441 100644 --- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c @@ -34,7 +34,7 @@ @@ -85,6 +86,3 @@ index 5e2a78b7a..204f0441a 100644 /* Also defined in net/linux_close.c */ #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) #elif __solaris__ --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch index dd5e051..4773f20 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2006-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 86de5eb9d031e7f8d241725d5eeaa7030cf2ce2b 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 2006/2008] 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 @@ -15,12 +15,13 @@ 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> + --- - src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- + 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 2425bf43a..1c8ebdb42 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 @@ @@ -32,7 +33,7 @@ index 2425bf43a..1c8ebdb42 100644 #include <execinfo.h> #endif -@@ -803,7 +803,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; } @@ -41,6 +42,3 @@ index 2425bf43a..1c8ebdb42 100644 void print_stack(void) { void *array[10]; --- -2.24.1 - 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 index 8f3d134..d205ae5 100644 --- 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 @@ -1,15 +1,16 @@ -From 0708dd8e56c1f28c2215561ba3035c8c538acef6 Mon Sep 17 00:00:00 2001 +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 2007/2008] jdk: no genx11 in headless +Subject: [PATCH] jdk: no genx11 in headless Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - make/GenerateSources.gmk | 8 +++++--- + 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 ba443f7da..2170150ac 100644 +index ba443f7d..2170150a 100644 --- a/jdk/make/GenerateSources.gmk +++ b/jdk/make/GenerateSources.gmk @@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows) @@ -27,6 +28,3 @@ index ba443f7da..2170150ac 100644 endif endif --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch index e725bf9..115914a 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch @@ -1,18 +1,19 @@ -From 0bb17a5083efcfd02e96ef034e51a190ea678f15 Mon Sep 17 00:00:00 2001 +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 2008/2008] jdk: no unused deps +Subject: [PATCH] jdk: no unused deps Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - make/CompileNativeLibraries.gmk | 2 ++ - make/lib/Awt2dLibraries.gmk | 30 +++++++++++++++++------ - src/solaris/native/sun/awt/jawt.c | 2 +- - src/solaris/native/sun/awt/utility/rect.h | 2 +- + 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 c23b958b0..2984302f0 100644 +index c23b958b..2984302f 100644 --- a/jdk/make/CompileNativeLibraries.gmk +++ b/jdk/make/CompileNativeLibraries.gmk @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk @@ -26,7 +27,7 @@ index c23b958b0..2984302f0 100644 # 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 cd8b94cd8..8d9c37246 100644 +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) @@ -40,7 +41,7 @@ index cd8b94cd8..8d9c37246 100644 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ $(X_CFLAGS) \ $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) -@@ -801,17 +805,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)) @@ -74,7 +75,7 @@ index cd8b94cd8..8d9c37246 100644 OGLBlitLoops.c \ OGLBufImgOps.c \ OGLContext.c \ -@@ -824,10 +839,9 @@ ifeq ($(BUILD_HEADLESS), true) +@@ -831,10 +846,9 @@ ifeq ($(BUILD_HEADLESS), true) OGLSurfaceData.c \ OGLTextRenderer.c \ OGLVertexCache.c \ @@ -88,7 +89,7 @@ index cd8b94cd8..8d9c37246 100644 LIBAWT_HEADLESS_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c -index 64284bc6e..b3584c7ef 100644 +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 @@ @@ -101,7 +102,7 @@ index 64284bc6e..b3584c7ef 100644 return JNI_FALSE; #else diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h -index ceea38f43..8d85782ba 100644 +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 @@ @@ -113,6 +114,3 @@ index ceea38f43..8d85782ba 100644 #include <X11/Xlib.h> typedef XRectangle RECT_T; #else --- -2.24.1 - 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/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch deleted file mode 100644 index e35d0eb..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: jdk8u-jdk8u242-ga/jdk/make/gensrc/GensrcMisc.gmk -=================================================================== ---- jdk8u-jdk8u242-ga.orig/jdk/make/gensrc/GensrcMisc.gmk -+++ jdk8u-jdk8u242-ga/jdk/make/gensrc/GensrcMisc.gmk -@@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUI - 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/aarch32-hotspot-fix-shark-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-shark-build-pt2.patch deleted file mode 100644 index b09745c..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-shark-build-pt2.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 b09745c..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.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 { |