<pre style='margin:0'>
Nils Breunese (breun) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b34034dca7467965d045a4f20c339c7bddba5fc4">https://github.com/macports/macports-ports/commit/b34034dca7467965d045a4f20c339c7bddba5fc4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b34034dca74 openjdk8-powerpc: new port to support modern Java on PowerPC (#25186)
</span>b34034dca74 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b34034dca7467965d045a4f20c339c7bddba5fc4
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sat Aug 17 20:46:29 2024 +0000
<span style='display:block; white-space:pre;color:#404040;'> openjdk8-powerpc: new port to support modern Java on PowerPC (#25186)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openjdk8-powerpc: new port to support modern Java on PowerPC
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openjdk8-powerpc: non-functional: use .xz source
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openjdk8-powerpc: use a version-specific URL
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Nils Breunese <nils@breun.nl>
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openjdk8-powerpc: install into MacPorts prefix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openjdk8-powerpc: non-functional: change way to set datamodel
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openjdk8-powerpc: use openjdk-sources.osci.io for livecheck
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ---------
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Nils Breunese <nils@breun.nl>
</span>---
java/openjdk8-powerpc/Portfile | 333 ++++++++
...-Fix-timebomb-bug-in-GenerateCurrencyData.patch | 23 +
.../0002-Ignore-__NSAutoreleaseNoPool-errors.patch | 422 ++++++++++
...s_perf_bsd-allow-to-compile-with-ZERO-CPU.patch | 40 +
.../files/0004-Added-macosx-bin-zero-jvm.cfg.patch | 54 ++
...ionsImpl.c-define-TCP_KEEPINTVL-and-TCP_K.patch | 33 +
...301-macos-support-full-window-content-opt.patch | 156 ++++
...inition-of-__private_extern__-where-undef.patch | 40 +
...8-8181503-Can-t-compile-hotspot-with-c-11.patch | 56 ++
.../files/0009-Disable-C-11-warnings.patch | 25 +
....cpp-implement-sync_val_compare_and_swap_.patch | 34 +
...02-CoreLibraries.gmk-do-not-hardcode-arch.patch | 22 +
.../1003-java_md_macosx-fix-broken-ObjC-code.patch | 85 ++
.../files/1004-os_bsd-add-ppc64-case.patch | 22 +
...5-jniTypes_ppc-downgrade-error-to-warning.patch | 22 +
.../files/1006-os_bsd.cpp-fix-vm_statistics.patch | 43 +
...1007-Awt2dLibraries-add-fnested-functions.patch | 21 +
...1008-java_md_macosx.c-define-preferredJVM.patch | 22 +
.../1009-os_bsd.cpp-allow-headless-on-Apple.patch | 32 +
.../files/1010-Makefile-fix-LP64-define.patch | 22 +
.../files/1011-No-dtrace-for-now.patch | 61 ++
...4-hack-around-a-broken-Xcode-version-dete.patch | 77 ++
.../files/1013-os_bsd.cpp-fix-running-VM.patch | 67 ++
.../1014-portconfig-try-fix-broken-pipe.patch | 35 +
...5-Some-hacks-to-fix-the-build-for-powerpc.patch | 876 +++++++++++++++++++++
25 files changed, 2623 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/Portfile b/java/openjdk8-powerpc/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..754d3abb49b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,333 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name openjdk8-powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set real_name openjdk8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts openjdk8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use format based on macports:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://guide.macports.org/chunked/reference.portgroup.html#reference.portgroup.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/openjdk/jdk8u/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Tags: https://github.com/openjdk/jdk8u/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set major 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set update 422
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set to the build of the 'jdk8u${update}-b${build}' tag that corresponds to the latest tag with '-ga'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set build 05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${major}u${update}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories java lang devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin < 11}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description OpenJDK 8 port for macOS PowerPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description JDK 8 and JRE 8 builds of OpenJDK, the Open-Source implementation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of the Java Platform, Standard Edition, and related projects. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is an experimental port for PowerPC systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://openjdk.org/projects/jdk8u/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://openjdk-sources.osci.io/openjdk8/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname openjdk${version}-b${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir jdk${version}-b${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d8340a12e1c5da00e2b5fd2d81348d02085b539e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c447e801b2d66823af320710738c44d51e6d62496569d39bfbe5d0dd822bd8c5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 60233820
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Generic patches:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-Fix-timebomb-bug-in-GenerateCurrencyData.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Ignore-__NSAutoreleaseNoPool-errors.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-os_perf_bsd-allow-to-compile-with-ZERO-CPU.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-Added-macosx-bin-zero-jvm.cfg.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-ExtendedOptionsImpl.c-define-TCP_KEEPINTVL-and-TCP_K.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-Revert-8211301-macos-support-full-window-content-opt.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-Provide-definition-of-__private_extern__-where-undef.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# If we build with Xcode gcc, we do not need any C11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![string match gcc-4.* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0008-8181503-Can-t-compile-hotspot-with-c-11.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0009-Disable-C-11-warnings.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PowerPC-specific patches:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1001-os_bsd_zero.cpp-implement-sync_val_compare_and_swap_.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1002-CoreLibraries.gmk-do-not-hardcode-arch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1003-java_md_macosx-fix-broken-ObjC-code.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1004-os_bsd-add-ppc64-case.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1005-jniTypes_ppc-downgrade-error-to-warning.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1006-os_bsd.cpp-fix-vm_statistics.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1007-Awt2dLibraries-add-fnested-functions.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1008-java_md_macosx.c-define-preferredJVM.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1009-os_bsd.cpp-allow-headless-on-Apple.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1010-Makefile-fix-LP64-define.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1011-No-dtrace-for-now.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1012-toolchain.m4-hack-around-a-broken-Xcode-version-dete.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1013-os_bsd.cpp-fix-running-VM.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1014-portconfig-try-fix-broken-pipe.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1015-Some-hacks-to-fix-the-build-for-powerpc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Active libnet breaks linking of libnio which should link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to JDK’s own internal libnet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libjpeg-turbo: https://trac.macports.org/ticket/67123
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build libjpeg-turbo libnet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# If you want to use an alternative JDK for bootstrap,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# change these values accordingly:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:openjdk7-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk7-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set tpath ${prefix}/Library/Java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set datamodel 64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set datamodel 32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set automake_dirs [glob -directory ${prefix}/share automake-*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set automake_dir [lindex [lsort -command vercmp $automake_dirs] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${automake_dir}/config.guess \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/common/autoconf/build-aux/autoconf-config.guess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${automake_dir}/config.sub \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/common/autoconf/build-aux/autoconf-config.sub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix targets:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|MACOSX_VERSION_MIN=10.7.0|MACOSX_VERSION_MIN=${macosx_deployment_target}.0|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/common/autoconf/flags.m4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|MACOSX_VERSION_MIN=10.9.0|MACOSX_VERSION_MIN=${macosx_deployment_target}.0|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/common/autoconf/flags.m4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|REQUIRED_OS_VERSION=11.2|REQUIRED_OS_VERSION=${macosx_deployment_target}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/common/autoconf/platform.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|WARNINGS_ARE_ERRORS = -Werror|WARNING_FLAGS =|g" hotspot/make/bsd/makefiles/gcc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wformat=2|WARNING_FLAGS = |g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/make/bsd/makefiles/gcc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@ZERO_ARCHDEF@|PPC32|g" hotspot/make/bsd/platform_zero.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@ZERO_LIBARCH@|ppc|g" hotspot/make/bsd/platform_zero.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ${prefix}/bin/bash ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args --prefix=${tpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bug_url "https://trac.macports.org/newticket?port=${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Default configure args:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-conf-name=${real_name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-debug-level=release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cflags="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cxxflags="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-ldflags="${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-freetype-include=${prefix}/include/freetype2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-freetype-lib=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-milestone=fcs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-native-debug-symbols=none \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-target-bits=${datamodel} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-update-version=${update} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vendor-bug-url="${bug_url}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vendor-name="MacPorts" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vendor-url="https://www.macports.org" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vendor-vm-bug-url="${bug_url}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See notes below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-num-cores=${buildmakejobs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://chromium.googlesource.com/chromium/src/+/52.0.2743.117/docs/mac_build_instructions.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# unable to execute command: posix_spawn failed: Resource temporarily unavailable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/nilsvanvelzen/mac_ppc_openjdk8u60/issues/2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Consider running \`sudo sysctl -w kern.maxproc=2500\` and \`sudo sysctl -w kern.maxprocperuid=2500\` before building"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/nilsvanvelzen/mac_ppc_openjdk8u60/commit/ea85e37ea7d7299007697afc3ca9ef2fd1fde2a9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This error may occur, and there is no perfect solution. Requiring to build on a single core will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# dramatically increase build time, which is already long. A confirmed-to-work hack is to switch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to a manual build in a case of a linkage failure: cd to extracted sources, sudo gmake + args used by MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Once the build completes, you can resume a standard MacPorts installation. There is no need to reconfigure,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# just run `sudo port build` or `sudo port install`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Linking may fail when building in parallel. In such a case use --with-num-cores=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string match *clang* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-toolchain-type=clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif { [string match *gcc* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-toolchain-type=gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match macports-gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Not needed for Xcode gcc. gcc14 converted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # some warnings into errors by default, turn those off:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-implicit-function-declaration \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-incompatible-pointer-types \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-int-conversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args --disable-headful
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.pre_args-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPILER_WARNINGS_FATAL=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Presently only zero is used (but keep these).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts core zero zeroshark \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {JVM with normal interpreter and a tiered C1/C2 compiler} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts debug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {OpenJDK with no debug information, all optimizations and no asserts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-debug-level=release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant debug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {OpenJDK with debug information, all optimizations and all asserts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-debug-level=fastdebug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-native-debug-symbols=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant core \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {JVM with interpreter only and no compiler} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant zero \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts core zeroshark server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {JVM with no assembler, no machine code interpreter and no compiler} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=zero \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cflags="${configure.cflags} -I${prefix}/include -arch ${configure.build_arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cxxflags="${configure.cxxflags} -arch ${configure.build_arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-ldflags="${configure.ldflags} -I${prefix}/lib -arch ${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-extra-cflags="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cxxflags="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-ldflags="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant zeroshark \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts core zero server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {JVM with no assembler, zero interpreter and shark/llvm compiler backend} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=zeroshark \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cflags="${configure.cflags} -I${prefix}/include -arch ${configure.build_arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cxxflags="${configure.cxxflags} -arch ${configure.build_arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-ldflags="${configure.ldflags} -I${prefix}/lib -arch ${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-extra-cflags="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cxxflags="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-ldflags="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset debug] && ![variant_isset release]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +zero
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.type gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target images
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jdkn jdk1.${major}.0_${update}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jren jre1.${major}.0_${update}.jre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jdk_path ${tpath}/JavaVirtualMachines/${real_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jre_path ${tpath}/JavaVirtualMachines/${real_name}-jre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jvms /Library/Java/JavaVirtualMachines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset zero]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We do not build macOS-style bundles here, so paths differ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jdk_bundle_dir build/openjdk8/images/j2sdk-image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jre_bundle_dir build/openjdk8/images/j2re-image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # But we want to install in a macOS-style:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${jdk_path}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${jre_path}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${jvms}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This renames j2*-image dirs to respective Homes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/${jdk_bundle_dir} ${destroot}${jdk_path}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/${jre_bundle_dir} ${destroot}${jre_path}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS Java tools expect to find Java virtual machines under /Library/Java/JavaVirtualMachines.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${jdk_path} ${destroot}${jvms}/${real_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need these:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/libfontconfig.1.dylib ${destroot}${jdk_path}/Contents/Home/jre/lib/libfontconfig.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/libfontconfig.1.dylib ${destroot}${jre_path}/Contents/Home/lib/libfontconfig.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Binaries are gone from worksrcpath, so run from destroot:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd ${destroot}${jdk_path}/Contents/Home/bin/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jdk_bundle_dir build/openjdk8/images/j2sdk-bundle/${jdkn}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jre_bundle_dir build/openjdk8/images/j2re-bundle/${jren}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${jdk_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${jre_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${jvms}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/${jdk_bundle_dir} ${destroot}${jdk_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/${jre_bundle_dir} ${destroot}${jre_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS Java tools expect to find Java virtual machines under /Library/Java/JavaVirtualMachines.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${jdk_path} ${destroot}${jvms}/${real_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd ${worksrcpath}/${jdk_bundle_dir}/Home/bin/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target -version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If you want to make ${name} the default JDK, add this to shell profile:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export JAVA_HOME=${jdk_path}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If you want to make the JRE installed by the ${real_name} the default JRE, add this to shell profile:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export JAVA_HOME=${jre_path}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex openjdk(8u\\d+)-ga
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0001-Fix-timebomb-bug-in-GenerateCurrencyData.patch b/java/openjdk8-powerpc/files/0001-Fix-timebomb-bug-in-GenerateCurrencyData.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..57ff86901ee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0001-Fix-timebomb-bug-in-GenerateCurrencyData.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cd4e154ccff7fd8dbb1fc5b8c9ff4f5155fb3cce Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 20:59:39 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix timebomb bug in GenerateCurrencyData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://issues.guix.gnu.org/issue/68333/attachment/5/1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../build/tools/generatecurrencydata/GenerateCurrencyData.java | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d424bc1494..d4cd6c1186 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -284,7 +284,7 @@ public class GenerateCurrencyData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ String timeString = currencyInfo.substring(4, length - 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long time = format.parse(timeString).getTime();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- throw new RuntimeException("time is more than 10 years from present: " + time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ System.err.println("note: time is more than 10 years from \"present\": " + time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ specialCaseCutOverTimes[specialCaseCount] = time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0002-Ignore-__NSAutoreleaseNoPool-errors.patch b/java/openjdk8-powerpc/files/0002-Ignore-__NSAutoreleaseNoPool-errors.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d9c93e54300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0002-Ignore-__NSAutoreleaseNoPool-errors.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,422 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c9806a9d61fcac79f4795c1e93a21036382ab4d4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 28 Sep 2022 18:03:12 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Ignore `__NSAutoreleaseNoPool` errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/autoconf/boot-jdk.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/autoconf/boot-jdk.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for Boot JDK])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([$BOOT_JDK])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([Boot JDK version])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([$BOOT_JDK_VERSION])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check rt.jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20360,7 +20360,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20512,7 +20512,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20703,7 +20703,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20855,7 +20855,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21043,7 +21043,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21195,7 +21195,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21242,7 +21242,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21394,7 +21394,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21581,7 +21581,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21733,7 +21733,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21807,7 +21807,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21959,7 +21959,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21998,7 +21998,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22150,7 +22150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22217,7 +22217,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22369,7 +22369,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22408,7 +22408,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22560,7 +22560,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22627,7 +22627,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22779,7 +22779,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22818,7 +22818,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22970,7 +22970,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23037,7 +23037,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23189,7 +23189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23228,7 +23228,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23380,7 +23380,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23434,7 +23434,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23586,7 +23586,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23623,7 +23623,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23775,7 +23775,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23830,7 +23830,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23982,7 +23982,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24019,7 +24019,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24171,7 +24171,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24225,7 +24225,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24377,7 +24377,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24414,7 +24414,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24566,7 +24566,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24621,7 +24621,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24773,7 +24773,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24810,7 +24810,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24962,7 +24962,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24998,7 +24998,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_JDK_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | head -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra M4 quote needed to protect [] in grep expression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25150,7 +25150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking Boot JDK version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v __NSAutoreleaseNoPool | $TR '\n\r' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$BOOT_JDK_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi # end check jdk version
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0003-os_perf_bsd-allow-to-compile-with-ZERO-CPU.patch b/java/openjdk8-powerpc/files/0003-os_perf_bsd-allow-to-compile-with-ZERO-CPU.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ad2d8535ef1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0003-os_perf_bsd-allow-to-compile-with-ZERO-CPU.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7df6fc5b9e3b287bf17791540ce758e688a96716 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 28 Sep 2022 20:49:23 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] os_perf_bsd: allow to compile with ZERO CPU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/os/bsd/vm/os_perf_bsd.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/os/bsd/vm/os_perf_bsd.cpp hotspot/src/os/bsd/vm/os_perf_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9e8fa0ef119..a7a156a35c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/os/bsd/vm/os_perf_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/os/bsd/vm/os_perf_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "memory/resourceArea.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "runtime/os.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "runtime/os_perf.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(X86) && !defined(ZERO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vm_version_ext_x86.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <libproc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -374,11 +376,13 @@ bool CPUInformationInterface::initialize() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NULL == _cpu_info) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(X86) && !defined(ZERO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _cpu_info->set_number_of_hardware_threads(VM_Version_Ext::number_of_threads());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _cpu_info->set_number_of_cores(VM_Version_Ext::number_of_cores());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _cpu_info->set_number_of_sockets(VM_Version_Ext::number_of_sockets());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _cpu_info->set_cpu_name(VM_Version_Ext::cpu_name());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _cpu_info->set_cpu_description(VM_Version_Ext::cpu_description());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0004-Added-macosx-bin-zero-jvm.cfg.patch b/java/openjdk8-powerpc/files/0004-Added-macosx-bin-zero-jvm.cfg.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..22a27f5aa8a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0004-Added-macosx-bin-zero-jvm.cfg.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bb4b17271b3de670f2bda3c07022b39e3bb88bf0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 30 Sep 2022 01:10:21 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Added `macosx/bin/zero/jvm.cfg`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/macosx/bin/zero/jvm.cfg | 35 +++++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 35 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 jdk/src/macosx/bin/zero/jvm.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/macosx/bin/zero/jvm.cfg jdk/src/macosx/bin/zero/jvm.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 00000000000..1b8d52792bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/macosx/bin/zero/jvm.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# This code is free software; you can redistribute it and/or modify it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# under the terms of the GNU General Public License version 2 only, as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# published by the Free Software Foundation. Oracle designates this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# particular file as subject to the "Classpath" exception as provided
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# by Oracle in the LICENSE file that accompanied this code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# This code is distributed in the hope that it will be useful, but WITHOUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# version 2 for more details (a copy is included in the LICENSE file that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# accompanied this code).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# You should have received a copy of the GNU General Public License version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# 2 along with this work; if not, write to the Free Software Foundation,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# or visit www.oracle.com if you need additional information or have any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# questions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# List of JVMs that can be used as an option to java, javac, etc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Order is important -- first in this list is the default JVM.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# NOTE that this both this file and its format are UNSUPPORTED and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# WILL GO AWAY in a future release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# You may also select a JVM in an arbitrary location with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# and may not be available in a future release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-server KNOWN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-client IGNORE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0005-ExtendedOptionsImpl.c-define-TCP_KEEPINTVL-and-TCP_K.patch b/java/openjdk8-powerpc/files/0005-ExtendedOptionsImpl.c-define-TCP_KEEPINTVL-and-TCP_K.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..00f55db8581
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0005-ExtendedOptionsImpl.c-define-TCP_KEEPINTVL-and-TCP_K.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3754312dfcccb91fa4aef57ac9aba3782a4f40b7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 30 Sep 2022 01:14:31 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] ExtendedOptionsImpl.c: define `TCP_KEEPINTVL` and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `TCP_KEEPCNT`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 9 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dc61a8c3e4e..62233024827 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -348,6 +348,15 @@ static jboolean flowSupported0() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SOCK_OPT_LEVEL IPPROTO_TCP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SOCK_OPT_NAME_KEEPIDLE TCP_KEEPALIVE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SOCK_OPT_NAME_KEEPIDLE_STR "TCP_KEEPALIVE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef TCP_KEEPINTVL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define TCP_KEEPINTVL -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef TCP_KEEPCNT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define TCP_KEEPCNT -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static jint socketOptionSupported(jint sockopt) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0006-Revert-8211301-macos-support-full-window-content-opt.patch b/java/openjdk8-powerpc/files/0006-Revert-8211301-macos-support-full-window-content-opt.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f14b425221c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0006-Revert-8211301-macos-support-full-window-content-opt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,156 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5a2353545ecd33e609d13a1f22ed29cc57e57633 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 30 Sep 2022 01:36:58 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Revert "8211301: [macos] support full window content options"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This reverts commit a75beab1a2adc3e6f48eb3e571864046581cb90e.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../sun/lwawt/macosx/CPlatformWindow.java | 36 +++----------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/macosx/native/sun/awt/AWTWindow.m | 36 +++----------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 8 insertions(+), 64 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 92640a63aa0..2600b1a54bd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,8 +102,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public static final String WINDOW_FADE_IN = "apple.awt._windowFadeIn";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public static final String WINDOW_FADE_OUT = "apple.awt._windowFadeOut";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public static final String WINDOW_FULLSCREENABLE = "apple.awt.fullscreenable";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- public static final String WINDOW_FULL_CONTENT = "apple.awt.fullWindowContent";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- public static final String WINDOW_TRANSPARENT_TITLE_BAR = "apple.awt.transparentTitleBar";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Yeah, I know. But it's easier to deal with ints from JNI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int MODELESS = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,10 +129,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int IS_DIALOG = 1 << 25;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int IS_MODAL = 1 << 26;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int IS_POPUP = 1 << 27;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static final int FULL_WINDOW_CONTENT = 1 << 14;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static final int _STYLE_PROP_BITMASK = DECORATED | TEXTURED | UNIFIED | UTILITY | HUD | SHEET | CLOSEABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | MINIMIZABLE | RESIZABLE | FULL_WINDOW_CONTENT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static final int _STYLE_PROP_BITMASK = DECORATED | TEXTURED | UNIFIED | UTILITY | HUD | SHEET | CLOSEABLE | MINIMIZABLE | RESIZABLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // corresponds to method-based properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int HAS_SHADOW = 1 << 10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,11 +141,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int DRAGGABLE_BACKGROUND = 1 << 19;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int DOCUMENT_MODIFIED = 1 << 21;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int FULLSCREENABLE = 1 << 23;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static final int TRANSPARENT_TITLE_BAR = 1 << 18;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static final int _METHOD_PROP_BITMASK = RESIZABLE | HAS_SHADOW | ZOOMABLE | ALWAYS_ON_TOP | HIDES_ON_DEACTIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | DRAGGABLE_BACKGROUND | DOCUMENT_MODIFIED | FULLSCREENABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | TRANSPARENT_TITLE_BAR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static final int _METHOD_PROP_BITMASK = RESIZABLE | HAS_SHADOW | ZOOMABLE | ALWAYS_ON_TOP | HIDES_ON_DEACTIVATE | DRAGGABLE_BACKGROUND | DOCUMENT_MODIFIED | FULLSCREENABLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // corresponds to callback-based properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static final int SHOULD_BECOME_KEY = 1 << 12;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,19 +197,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ final String filename = ((java.io.File)value).getAbsolutePath();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c.execute(ptr->nativeSetNSWindowRepresentedFilename(ptr, filename));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- new Property<CPlatformWindow>(WINDOW_FULL_CONTENT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- public void applyProperty(final CPlatformWindow c, final Object value) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boolean isFullWindowContent = Boolean.parseBoolean(value.toString());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c.setStyleBits(FULL_WINDOW_CONTENT, isFullWindowContent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- new Property<CPlatformWindow>(WINDOW_TRANSPARENT_TITLE_BAR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- public void applyProperty(final CPlatformWindow c, final Object value) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boolean isTransparentTitleBar = Boolean.parseBoolean(value.toString());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c.setStyleBits(TRANSPARENT_TITLE_BAR, isTransparentTitleBar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public CPlatformWindow convertJComponentToTarget(final JRootPane p) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Component root = SwingUtilities.getRoot(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,16 +417,6 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (prop != null) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ styleBits = SET(styleBits, DRAGGABLE_BACKGROUND, Boolean.parseBoolean(prop.toString()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prop = rootpane.getClientProperty(WINDOW_FULL_CONTENT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (prop != null) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- styleBits = SET(styleBits, FULL_WINDOW_CONTENT, Boolean.parseBoolean(prop.toString()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prop = rootpane.getClientProperty(WINDOW_TRANSPARENT_TITLE_BAR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (prop != null) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- styleBits = SET(styleBits, TRANSPARENT_TITLE_BAR, Boolean.parseBoolean(prop.toString()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isDialog) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/macosx/native/sun/awt/AWTWindow.m jdk/src/macosx/native/sun/awt/AWTWindow.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 92fff249ccf..2036b6a3036 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/macosx/native/sun/awt/AWTWindow.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/macosx/native/sun/awt/AWTWindow.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,9 +202,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSUInteger type = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (IS(styleBits, DECORATED)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type |= NSTitledWindowMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (IS(styleBits, CLOSEABLE)) type |= NSClosableWindowMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (IS(styleBits, RESIZABLE)) type |= NSResizableWindowMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (IS(styleBits, FULL_WINDOW_CONTENT)) type |= NSFullSizeContentViewWindowMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (IS(styleBits, CLOSEABLE)) type |= NSClosableWindowMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (IS(styleBits, RESIZABLE)) type |= NSResizableWindowMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type |= NSBorderlessWindowMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,9 +263,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (IS(mask, TRANSPARENT_TITLE_BAR) && [self.nsWindow respondsToSelector:@selector(setTitlebarAppearsTransparent:)]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self.nsWindow setTitlebarAppearsTransparent:IS(bits, TRANSPARENT_TITLE_BAR)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (id) initWithPlatformWindow:(JNFWeakJObjectWrapper *)platformWindow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1020,29 +1016,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AWTWindow *window = (AWTWindow*)[nsWindow delegate];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // scans the bit field, and only updates the values requested by the mask
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // (this implicitly handles the _CALLBACK_PROP_BITMASK case, since those are passive reads)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // (this implicity handles the _CALLBACK_PROP_BITMASK case, since those are passive reads)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jint newBits = window.styleBits & ~mask | bits & mask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOL resized = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Check for a change to the full window content view option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // The content view must be resized first, otherwise the window will be resized to fit the existing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // content view.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (IS(mask, FULL_WINDOW_CONTENT)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (IS(newBits, FULL_WINDOW_CONTENT) != IS(window.styleBits, FULL_WINDOW_CONTENT)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSRect frame = [nsWindow frame];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSUInteger styleMask = [AWTWindow styleMaskForStyleBits:newBits];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSRect screenContentRect = [NSWindow contentRectForFrameRect:frame styleMask:styleMask];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSRect contentFrame = NSMakeRect(screenContentRect.origin.x - frame.origin.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- screenContentRect.origin.y - frame.origin.y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- screenContentRect.size.width,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- screenContentRect.size.height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSView* view = (NSView*)nsWindow.contentView;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- view.frame = contentFrame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- resized = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // resets the NSWindow's style mask if the mask intersects any of those bits
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (mask & MASK(_STYLE_PROP_BITMASK)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [nsWindow setStyleMask:[AWTWindow styleMaskForStyleBits:newBits]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1054,10 +1030,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ window.styleBits = newBits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (resized) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [window _deliverMoveResizeEvent];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JNF_COCOA_EXIT(env);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0007-Provide-definition-of-__private_extern__-where-undef.patch b/java/openjdk8-powerpc/files/0007-Provide-definition-of-__private_extern__-where-undef.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4ddb52ef8a9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0007-Provide-definition-of-__private_extern__-where-undef.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4887480d56d550c0d67daa9dced604af6cd436d2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 9 Jul 2024 03:38:30 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Provide definition of __private_extern__ where
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/solaris/native/java/io/io_util_md.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/java/io/io_util_md.c jdk/src/solaris/native/java/io/io_util_md.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0dee96b890..86407b2e5f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/java/io/io_util_md.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/java/io/io_util_md.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__private_extern__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __private_extern__ __attribute__((visibility("hidden")))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MACOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/java/net/Inet6AddressImpl.c jdk/src/solaris/native/java/net/Inet6AddressImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bb351af3f8..f6c56a9531 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/java/net/Inet6AddressImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/java/net/Inet6AddressImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NI_MAXHOST 1025
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__private_extern__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __private_extern__ __attribute__((visibility("hidden")))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /************************************************************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Inet6AddressImpl
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0008-8181503-Can-t-compile-hotspot-with-c-11.patch b/java/openjdk8-powerpc/files/0008-8181503-Can-t-compile-hotspot-with-c-11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9e3a576ca65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0008-8181503-Can-t-compile-hotspot-with-c-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 74983373354b2708b4fa75f59395c68dc65b3e96 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Gerard Ziemski <gziemski@openjdk.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 31 Jan 2018 11:12:12 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] 8181503: Can't compile hotspot with c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixed 5 unique c++14 compiler issues
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: coleenp, dholmes, kbarrett
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/share/vm/code/compiledIC.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bfa4243f754..f0de6456b11 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -281,11 +281,11 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ address os::current_stack_pointer() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__clang__) || defined(__llvm__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register void *esp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __asm__("mov %%" SPELL_REG_SP ", %0":"=r"(esp));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (address) esp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(SPARC_WORKS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register void *esp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __asm__("mov %%" SPELL_REG_SP ", %0":"=r"(esp));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (address) ((char*)esp + sizeof(long)*2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register void *esp __asm__ (SPELL_REG_SP);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,7 +368,7 @@ frame os::get_sender_for_C_frame(frame* fr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ intptr_t* _get_previous_fp() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(SPARC_WORKS) || defined(__clang__) || defined(__llvm__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register intptr_t **ebp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __asm__("mov %%" SPELL_REG_FP ", %0":"=r"(ebp));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register intptr_t **ebp __asm__ (SPELL_REG_FP);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/share/vm/code/compiledIC.cpp hotspot/src/share/vm/code/compiledIC.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 63821c06130..06794215084 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/share/vm/code/compiledIC.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/share/vm/code/compiledIC.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,7 +222,7 @@ bool CompiledIC::set_to_megamorphic(CallInfo* call_info, Bytecodes::Code bytecod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(bytecode == Bytecodes::_invokeinterface, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int itable_index = call_info->itable_index();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entry = VtableStubs::find_itable_stub(itable_index);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (entry == false) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (entry == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef ASSERT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/0009-Disable-C-11-warnings.patch b/java/openjdk8-powerpc/files/0009-Disable-C-11-warnings.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1d3bb0d1747
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/0009-Disable-C-11-warnings.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 66490f3ef3d4f808976f43f26198e3e2bc1b6d9f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 28 Sep 2022 21:01:43 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Disable C++11 warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/make/bsd/makefiles/gcc.make | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/make/bsd/makefiles/gcc.make hotspot/make/bsd/makefiles/gcc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 65b31149756..1c6dcb19062 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/make/bsd/makefiles/gcc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/make/bsd/makefiles/gcc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,6 +258,8 @@ ifeq ($(USE_CLANG), true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # WARNINGS_ARE_ERRORS += -Wno-tautological-constant-out-of-range-compare
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNINGS_ARE_ERRORS += -Wno-delete-non-virtual-dtor -Wno-deprecated -Wno-format -Wno-dynamic-class-memaccess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNINGS_ARE_ERRORS += -Wno-empty-body
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WARNINGS_ARE_ERRORS += -Wno-reserved-user-defined-literal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WARNINGS_ARE_ERRORS += -Wno-c++11-narrowing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wformat=2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1001-os_bsd_zero.cpp-implement-sync_val_compare_and_swap_.patch b/java/openjdk8-powerpc/files/1001-os_bsd_zero.cpp-implement-sync_val_compare_and_swap_.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a313c1d4e29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1001-os_bsd_zero.cpp-implement-sync_val_compare_and_swap_.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0674009b78fc79430aab39facf78bc57a0386a7f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 10 Jul 2024 19:37:46 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] os_bsd_zero.cpp: implement sync_val_compare_and_swap_8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Credits to @nilsvanvelzen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Cherry-picked from: https://github.com/nilsvanvelzen/mac_ppc_openjdk8u60/commit/25b5795c961e3199e76d023f6a2f531d5fc33210
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 12 ++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9bbabfbcf9..3dcd3244de 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -456,8 +456,16 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ volatile void *ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long long unsigned int oldval,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long long unsigned int newval) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ShouldNotCallThis();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0; // silence compiler warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ long long unsigned int curval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __sync_synchronize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ curval = *( long long unsigned int *) (ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // curval = static_cast<long long unsigned int>(*ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (curval == oldval){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // static_cast<long long unsigned int> *ptr = newval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *( long long unsigned int *) (ptr) = newval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return curval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // ShouldNotCallThis();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // !_LP64
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1002-CoreLibraries.gmk-do-not-hardcode-arch.patch b/java/openjdk8-powerpc/files/1002-CoreLibraries.gmk-do-not-hardcode-arch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b32961d4b54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1002-CoreLibraries.gmk-do-not-hardcode-arch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 67dde31eff9b2fe8a7da9389bd53a64ac6c723c5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 19:00:46 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] CoreLibraries.gmk: do not hardcode arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/make/lib/CoreLibraries.gmk | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/make/lib/CoreLibraries.gmk jdk/make/lib/CoreLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bb915869d6..34d61140b5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/make/lib/CoreLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/make/lib/CoreLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LANG := C, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS := $(CFLAGS_JDKLIB) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS := -nostdlib -r -arch x86_64, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS := -nostdlib -r, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1003-java_md_macosx-fix-broken-ObjC-code.patch b/java/openjdk8-powerpc/files/1003-java_md_macosx-fix-broken-ObjC-code.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4d038cc5f9c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1003-java_md_macosx-fix-broken-ObjC-code.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,85 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 323781fe5fe16612591dfdfbec7482e3787c7110 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 9 Jul 2024 02:37:36 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] java_md_macosx: fix broken ObjC code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/macosx/bin/java_md_macosx.c | 56 +++++++++++++++++++----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 38 insertions(+), 18 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/macosx/bin/java_md_macosx.c jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 854d848f81..89210cb708 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1026,6 +1026,32 @@ SetXStartOnFirstThreadArg()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setenv(envVar, "1", 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* This class is made for performSelectorOnMainThread when java main
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * should be launched on main thread.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * We cannot use dispatch_sync here, because it blocks the main dispatch queue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * which is used inside Cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@interface JavaLaunchHelper : NSObject {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int _returnValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void) launchJava:(NSValue*)argsValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (int) getReturnValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@implementation JavaLaunchHelper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void) launchJava:(NSValue*)argsValue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _returnValue = JavaMain([argsValue pointerValue]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (int) getReturnValue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return _returnValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // MacOSX we may continue in the same thread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JVMInit(InvocationFunctions* ifn, jlong threadStackSize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1035,26 +1061,20 @@ JVMInit(InvocationFunctions* ifn, jlong threadStackSize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JLI_TraceLauncher("In same thread\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // need to block this thread against the main thread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // so signals get caught correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __block int rslt = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ JavaMainArgs args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.argc = argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.argv = argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.mode = mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.what = what;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.ifn = *ifn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int rslt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock: ^{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JavaMainArgs args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.argc = argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.argv = argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.mode = mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.what = what;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.ifn = *ifn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rslt = JavaMain(&args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * We cannot use dispatch_sync here, because it blocks the main dispatch queue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Using the main NSRunLoop allows the dispatch queue to run properly once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * SWT (or whatever toolkit this is needed for) kicks off it's own NSRunLoop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * and starts running.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [op performSelectorOnMainThread:@selector(start) withObject:nil waitUntilDone:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ JavaLaunchHelper* launcher = [[[JavaLaunchHelper alloc] init] autorelease];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [launcher performSelectorOnMainThread:@selector(launchJava:)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ withObject:[NSValue valueWithPointer:(void*)&args]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ waitUntilDone:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rslt = [launcher getReturnValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [pool drain];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return rslt;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1004-os_bsd-add-ppc64-case.patch b/java/openjdk8-powerpc/files/1004-os_bsd-add-ppc64-case.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f0a451f14e4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1004-os_bsd-add-ppc64-case.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 13ccafe6d6edaa13fa6c8fa5d26421c154db204c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 8 Jul 2024 22:55:37 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] os_bsd: add ppc64 case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/os/bsd/vm/os_bsd.cpp | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/os/bsd/vm/os_bsd.cpp hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fd2c504e4f..0c5cebc229 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,6 +239,8 @@ static char cpu_arch[] = "amd64";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char cpu_arch[] = "arm";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(PPC32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char cpu_arch[] = "ppc";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(PPC64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static char cpu_arch[] = "ppc64";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(SPARC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef _LP64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char cpu_arch[] = "sparcv9";
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1005-jniTypes_ppc-downgrade-error-to-warning.patch b/java/openjdk8-powerpc/files/1005-jniTypes_ppc-downgrade-error-to-warning.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..663c54e0073
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1005-jniTypes_ppc-downgrade-error-to-warning.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c62b308f8f681bc7e9ba32e89df571a26c5dea64 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 19:11:32 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] jniTypes_ppc: downgrade error to warning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9178bd442a..72f30c75ca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@ class JNITypes : AllStatic {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef PPC64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#error "ppc32 support currently not implemented!!!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC warning "ppc32 support currently not implemented!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // PPC64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1006-os_bsd.cpp-fix-vm_statistics.patch b/java/openjdk8-powerpc/files/1006-os_bsd.cpp-fix-vm_statistics.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bd8ec3b83de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1006-os_bsd.cpp-fix-vm_statistics.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 98b8cd66ab707cee579e59ad0632529083902e31 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 19:14:09 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] os_bsd.cpp: fix vm_statistics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/os/bsd/vm/os_bsd.cpp | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/os/bsd/vm/os_bsd.cpp hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6d1009b84c..5bc3693334 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,6 +112,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <mach-o/dyld.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/proc_info.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <objc/objc-auto.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef MAP_ANONYMOUS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,12 +172,21 @@ julong os::available_memory() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ julong os::Bsd::available_memory() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint64_t available = physical_memory() >> 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __ppc__ || defined __i386__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_msg_type_number_t count = HOST_VM_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vm_statistics_data_t vmstat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t kerr = host_statistics(mach_host_self(), HOST_VM_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (host_info_t)&vmstat, &count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert(kerr == KERN_SUCCESS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "host_statistics failed - check mach_host_self() and count");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else // 64-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach_msg_type_number_t count = HOST_VM_INFO64_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vm_statistics64_data_t vmstat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kern_return_t kerr = host_statistics64(mach_host_self(), HOST_VM_INFO64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (host_info64_t)&vmstat, &count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(kerr == KERN_SUCCESS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "host_statistics64 failed - check mach_host_self() and count");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (kerr == KERN_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ available = vmstat.free_count * os::vm_page_size();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1007-Awt2dLibraries-add-fnested-functions.patch b/java/openjdk8-powerpc/files/1007-Awt2dLibraries-add-fnested-functions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2bee0269b38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1007-Awt2dLibraries-add-fnested-functions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a02652c16a50435015172708608d75c0990b5a3a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 19:26:17 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Awt2dLibraries: add -fnested-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/make/lib/Awt2dLibraries.gmk | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/make/lib/Awt2dLibraries.gmk jdk/make/lib/Awt2dLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 01e0369017..cd579f7a9a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/make/lib/Awt2dLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/make/lib/Awt2dLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1370,6 +1370,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMIZATION := LOW, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS := $(CFLAGS_JDKLIB) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(X_CFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -fnested-functions \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(X_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1008-java_md_macosx.c-define-preferredJVM.patch b/java/openjdk8-powerpc/files/1008-java_md_macosx.c-define-preferredJVM.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e29a1d0f74a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1008-java_md_macosx.c-define-preferredJVM.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f741717968603ed2aaa6f380574a8ff6cb801806 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 19:30:01 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] java_md_macosx.c: define preferredJVM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/macosx/bin/java_md_macosx.c | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/macosx/bin/java_md_macosx.c jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6aa0eb588a..854d848f81 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -228,6 +228,8 @@ static InvocationFunctions *GetExportedJNIFunctions() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ preferredJVM = "client";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ preferredJVM = "server";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm64__) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ preferredJVM = "server";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error "Unknown architecture - needs definition"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1009-os_bsd.cpp-allow-headless-on-Apple.patch b/java/openjdk8-powerpc/files/1009-os_bsd.cpp-allow-headless-on-Apple.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..407db1e20b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1009-os_bsd.cpp-allow-headless-on-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 626639607592547c8252b3a6f8c9cb9d5b64c030 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 19:32:30 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] os_bsd.cpp: allow headless on Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/os/bsd/vm/os_bsd.cpp | 5 -----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/os/bsd/vm/os_bsd.cpp hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5bc3693334..fd2c504e4f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4847,10 +4847,6 @@ int os::fork_and_exec(char* cmd, bool use_vfork_if_available) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // as libawt.so, and renamed libawt_xawt.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool os::is_headless_jre() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // We no longer build headless-only on Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat statbuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char buf[MAXPATHLEN];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char libmawtpath[MAXPATHLEN];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4882,7 +4878,6 @@ bool os::is_headless_jre() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (::stat(libmawtpath, &statbuf) == 0) return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Get the default path to the core file
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1010-Makefile-fix-LP64-define.patch b/java/openjdk8-powerpc/files/1010-Makefile-fix-LP64-define.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4778527f2ce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1010-Makefile-fix-LP64-define.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b3f8813d70c2ad67390204be1e7d6964aea58f3f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 19:44:17 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Makefile: fix LP64 define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/make/bsd/Makefile | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/make/bsd/Makefile hotspot/make/bsd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2bec290e30..ae8daffa7b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/make/bsd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/make/bsd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we need to set up LP64 correctly to satisfy sanity checks in adlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MFLAGS += " LP64=1 "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MFLAGS += " LP64=0 "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pass USE_SUNCC further, through MFLAGS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1011-No-dtrace-for-now.patch b/java/openjdk8-powerpc/files/1011-No-dtrace-for-now.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..89d9ec67e68
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1011-No-dtrace-for-now.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4f2a81a360f4e75d88fd20a598bccaf7ed145a14 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 19:47:50 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] No dtrace for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/make/bsd/makefiles/dtrace.make | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/make/bsd/makefiles/top.make | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/make/bsd/makefiles/vm.make | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 7 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/make/bsd/makefiles/dtrace.make hotspot/make/bsd/makefiles/dtrace.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9374062d11..7311ae245f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/make/bsd/makefiles/dtrace.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/make/bsd/makefiles/dtrace.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -367,7 +367,7 @@ ifneq ("${DTRACE_PROG}", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DTRACE_OBJS = $(DTRACE.o) #$(JVMOFFS.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += -DDTRACE_ENABLED #$(DTRACE_INCL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CFLAGS += -DDTRACE_ENABLED #$(DTRACE_INCL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #clangCFLAGS += -DDTRACE_ENABLED -fno-optimize-sibling-calls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #MAPFILE_DTRACE_OPT = $(MAPFILE_DTRACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/make/bsd/makefiles/top.make hotspot/make/bsd/makefiles/top.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 472b439ed0..698c2d9692 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/make/bsd/makefiles/top.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/make/bsd/makefiles/top.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,14 +98,14 @@ jvmti_stuff: $(Cached_plat) $(adjust-mflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jfr_stuff: $(Cached_plat) $(adjust-mflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @$(MAKE) -f jfr.make $(MFLAGS-adjusted)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OS_VENDOR), Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifeq ($(OS_VENDOR), Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # generate dtrace header files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dtrace_stuff: $(Cached_plat) $(adjust-mflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @$(MAKE) -f dtrace.make dtrace_stuff $(MFLAGS-adjusted) GENERATED=$(GENERATED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# dtrace_stuff: $(Cached_plat) $(adjust-mflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# @$(MAKE) -f dtrace.make dtrace_stuff $(MFLAGS-adjusted) GENERATED=$(GENERATED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dtrace_stuff:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @# We need a null action here, so implicit rules don't get consulted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # generate SA jar files and native header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sa_stuff:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/make/bsd/makefiles/vm.make hotspot/make/bsd/makefiles/vm.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fabf5897fb..1dca75ee15 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/make/bsd/makefiles/vm.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/make/bsd/makefiles/vm.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,7 +396,7 @@ include $(MAKEFILES_DIR)/saproc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS_VENDOR), Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no libjvm_db for macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Doing vm.make build:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1012-toolchain.m4-hack-around-a-broken-Xcode-version-dete.patch b/java/openjdk8-powerpc/files/1012-toolchain.m4-hack-around-a-broken-Xcode-version-dete.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bebd0c77b2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1012-toolchain.m4-hack-around-a-broken-Xcode-version-dete.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,77 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5e6c5c476700f9bd27b6a4fb217859edcb466a28 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 6 May 2024 21:18:03 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] toolchain.m4: hack around a broken Xcode version detect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Xcode version detection may or may not work. When it does not, it breaks configure.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Thankfully, we do not need it at all on Darwin PowerPC.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common/autoconf/generated-configure.sh | 19 ++-----------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common/autoconf/toolchain.m4 | 16 +---------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 3 insertions(+), 32 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git common/autoconf/generated-configure.sh common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6f17436eff..fcef8fb4e2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26102,22 +26102,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VALID_TOOLCHAINS=${!toolchain_var_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # On Mac OS X, default toolchain to clang after Xcode 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XCODE_VERSION_OUTPUT=`xcodebuild -version 2>&1 | $HEAD -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $? -ne 0; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "Failed to determine Xcode version." "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $SED -e 's/^Xcode \([1-9][0-9.]*\)/\1/' | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $CUT -f 1 -d .`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: Xcode major version: $XCODE_MAJOR_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "$as_me: Xcode major version: $XCODE_MAJOR_VERSION" >&6;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $XCODE_MAJOR_VERSION -ge 5; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEFAULT_TOOLCHAIN="clang"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEFAULT_TOOLCHAIN="gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEFAULT_TOOLCHAIN="gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # First toolchain type in the list is the default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27518,7 +27503,7 @@ $as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET_DEVELOPER_DIR=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$XCODE_PATH"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEVELOPER_DIR="$XCODE_PATH"/Contents/Developer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEVELOPER_DIR="$XCODE_PATH"/Developer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEVELOPER_DIR could also be provided directly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git common/autoconf/toolchain.m4 common/autoconf/toolchain.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ba4798e795..353ce121e4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/autoconf/toolchain.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/autoconf/toolchain.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,21 +151,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VALID_TOOLCHAINS=${!toolchain_var_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # On Mac OS X, default toolchain to clang after Xcode 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XCODE_VERSION_OUTPUT=`xcodebuild -version 2>&1 | $HEAD -n 1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $? -ne 0; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([Failed to determine Xcode version.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $SED -e 's/^Xcode \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/' | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $CUT -f 1 -d .`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_NOTICE([Xcode major version: $XCODE_MAJOR_VERSION])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $XCODE_MAJOR_VERSION -ge 5; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEFAULT_TOOLCHAIN="clang"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEFAULT_TOOLCHAIN="gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEFAULT_TOOLCHAIN="gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # First toolchain type in the list is the default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1013-os_bsd.cpp-fix-running-VM.patch b/java/openjdk8-powerpc/files/1013-os_bsd.cpp-fix-running-VM.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e7163afa8d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1013-os_bsd.cpp-fix-running-VM.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,67 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0b6b6b74e3b21cd11a576b821ddbd0cc13ab9ab3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 8 Jul 2024 23:01:03 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] os_bsd.cpp: fix running VM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/os/bsd/vm/os_bsd.cpp | 12 ++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/os/bsd/vm/os_bsd.cpp hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c5cebc229..87eec228fa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -678,7 +678,7 @@ static bool _thread_safety_check(Thread* thread) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // library handle for calling objc_registerThreadWithCollector()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // without static linking to the libobjc library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OBJC_LIB "/usr/lib/libobjc.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -688,7 +688,7 @@ extern "C" objc_registerThreadWithCollector_t objc_registerThreadWithCollectorFu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc_registerThreadWithCollector_t objc_registerThreadWithCollectorFunction = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static uint64_t locate_unique_thread_id(mach_port_t mach_thread_port) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Additional thread_id used to correlate threads in SA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thread_identifier_info_data_t m_ident_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -728,7 +728,7 @@ static void *java_start(Thread *thread) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osthread->set_thread_id(os::Bsd::gettid());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint64_t unique_thread_id = locate_unique_thread_id(osthread->thread_id());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guarantee(unique_thread_id != 0, "unique thread id was not found");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osthread->set_unique_thread_id(unique_thread_id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -739,7 +739,7 @@ static void *java_start(Thread *thread) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // initialize floating point control register
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os::Bsd::init_thread_fpu_state();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // register thread with objc gc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (objc_registerThreadWithCollectorFunction != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc_registerThreadWithCollectorFunction();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -891,7 +891,7 @@ bool os::create_attached_thread(JavaThread* thread) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osthread->set_thread_id(os::Bsd::gettid());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Store pthread info into the OSThread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint64_t unique_thread_id = locate_unique_thread_id(osthread->thread_id());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guarantee(unique_thread_id != 0, "just checking");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osthread->set_unique_thread_id(unique_thread_id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3803,7 +3803,7 @@ jint os::init_2(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // initialize thread priority policy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prio_init();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // dynamically link to objective c gc registration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *handleLibObjc = dlopen(OBJC_LIB, RTLD_LAZY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (handleLibObjc != NULL) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1014-portconfig-try-fix-broken-pipe.patch b/java/openjdk8-powerpc/files/1014-portconfig-try-fix-broken-pipe.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6a57d9b3a24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1014-portconfig-try-fix-broken-pipe.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7aac8e14aa2b6c3310e65cde3e3f9656b3c45dff Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 9 Jul 2024 02:35:51 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] portconfig: try fix broken pipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/solaris/native/sun/net/portconfig.c | 8 ++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/sun/net/portconfig.c jdk/src/solaris/native/sun/net/portconfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 56730f0f40..30b8a10c6f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/sun/net/portconfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/sun/net/portconfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,9 +93,7 @@ static int getPortRange(struct portrange *range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Method: getLower0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Signature: ()I
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getLower0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (JNIEnv *env, jclass clazz)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getLower0 (JNIEnv *env, jclass clazz) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct portrange range;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (getPortRange(&range) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,9 +106,7 @@ JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getLower0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Method: getUpper0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Signature: ()I
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getUpper0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (JNIEnv *env, jclass clazz)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getUpper0 (JNIEnv *env, jclass clazz) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct portrange range;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (getPortRange(&range) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-powerpc/files/1015-Some-hacks-to-fix-the-build-for-powerpc.patch b/java/openjdk8-powerpc/files/1015-Some-hacks-to-fix-the-build-for-powerpc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c16253440e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-powerpc/files/1015-Some-hacks-to-fix-the-build-for-powerpc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,876 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3f5bda4b33b9098109917b155c0d6c4227568e03 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 21:05:23 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Some hacks to fix the build for powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Mostly borrowed from https://github.com/nilsvanvelzen/mac_ppc_openjdk8u60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with some modifications and updates.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/agent/src/os/bsd/Makefile | 4 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/make/bsd/makefiles/saproc.make | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hotspot/src/os/bsd/vm/os_bsd.cpp | 4 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/make/Bundles.gmk | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/make/CompileLaunchers.gmk | 20 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/make/lib/Awt2dLibraries.gmk | 52 +++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/make/lib/PlatformLibraries.gmk | 11 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/macosx/bin/java_md_macosx.c | 4 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../media/sound/PLATFORM_API_MacOSX_PCM.cpp | 7 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/macosx/native/sun/font/AWTFont.m | 99 +------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../nio/ch/SocketOptionRegistry.java.template | 2 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../share/native/sun/font/AccelGlyphCache.c | 6 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/solaris/native/java/net/net_util_md.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/solaris/native/sun/awt/CUPSfuncs.c | 32 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../solaris/native/sun/awt/HeadlessToolkit.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../solaris/native/sun/awt/awt_LoadLibrary.c | 10 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/solaris/native/sun/awt/fontpath.c | 7 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jdk/src/solaris/native/sun/awt/jawt.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../native/sun/nio/ch/DatagramChannelImpl.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 19 files changed, 89 insertions(+), 180 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/agent/src/os/bsd/Makefile hotspot/agent/src/os/bsd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af22b597b8..3ae3f1fb4f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/agent/src/os/bsd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/agent/src/os/bsd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,8 +51,8 @@ SOURCES = symtab.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJS = $(SOURCES:.c=.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJSPLUS = MacosxDebuggerLocal.o sadis.o $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTINCLUDE = -I.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTCFLAGS = -m64 -D__APPLE__ -framework JavaNativeFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FOUNDATIONFLAGS = -framework Foundation -framework JavaNativeFoundation -framework Security -framework CoreFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EXTCFLAGS = -D__APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FOUNDATIONFLAGS = -framework Foundation -framework Security -framework CoreFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSA = $(ARCH)/libsaproc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif # Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/make/bsd/makefiles/saproc.make hotspot/make/bsd/makefiles/saproc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5c837895f6..284cb2ebba 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/make/bsd/makefiles/saproc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/make/bsd/makefiles/saproc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,6 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SASRCFILES = $(DARWIN_NON_STUB_SASRCFILES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SALIBS = -g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Foundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaNativeFoundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Security \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework CoreFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #objc compiler blows up on -march=i586, perhaps it should not be included in the macosx intel 32-bit C++ compiles?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git hotspot/src/os/bsd/vm/os_bsd.cpp hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 87eec228fa..b640906a86 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hotspot/src/os/bsd/vm/os_bsd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3842,7 +3842,7 @@ int os::active_processor_count() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void os::set_native_thread_name(const char *name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED > 1050) && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This is only supported in Snow Leopard and beyond
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (name != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Add a "Java: " prefix to the name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3850,6 +3850,8 @@ void os::set_native_thread_name(const char *name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf(buf, sizeof(buf), "Java: %s", name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_setname_np(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/make/Bundles.gmk jdk/make/Bundles.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 555d7bbab4..d55da545bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/make/Bundles.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/make/Bundles.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@ include MakeBase.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default: bundles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only macosx has bundles defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bundles: jre-bundle jdk-bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/make/CompileLaunchers.gmk jdk/make/CompileLaunchers.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 61973b3bd6..ceae21ed26 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/make/CompileLaunchers.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/make/CompileLaunchers.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,11 +263,11 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(eval $(call SetupLauncher,appletviewer, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(XLIBS)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $(eval $(call SetupLauncher,appletviewer, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $(XLIBS)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(eval $(call SetupLauncher,extcheck, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -400,11 +400,11 @@ $(eval $(call SetupLauncher,keytool, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(eval $(call SetupLauncher,native2ascii, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(eval $(call SetupLauncher,policytool, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(XLIBS)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $(eval $(call SetupLauncher,policytool, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $(XLIBS)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(eval $(call SetupLauncher,rmic, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXPAND_CLASSPATH_WILDCARDS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/make/lib/Awt2dLibraries.gmk jdk/make/lib/Awt2dLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cd579f7a9a..b2ec36284d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/make/lib/Awt2dLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/make/lib/Awt2dLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +186,7 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CFLAGS_JDKLIB), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS := $(LDFLAGS_JDKLIB) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(BUILD_LIBMLIB_LDLIBS) -ljvm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(call SET_SHARED_LIBRARY_ORIGIN), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SUFFIX_solaris := -lc, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -223,7 +223,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else ifneq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else ifneq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBAWT_DIRS += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -477,11 +477,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS_SUFFIX_macosx := -ljvm $(LIBM) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework OpenGL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaNativeFoundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaRuntimeSupport \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework ApplicationServices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework AudioToolbox \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ljava, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -504,7 +502,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BUILD_LIBAWT): $(BUILD_LIBJAVA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -764,7 +762,7 @@ BUILD_LIBRARIES += $(BUILD_LIBJPEG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(BUILD_HEADLESS), true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mac and Windows only use the native AWT lib, do not build libawt_headless
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(findstring $(OPENJDK_TARGET_OS), windows),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -773,7 +771,7 @@ ifeq ($(BUILD_HEADLESS), true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -873,7 +871,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11TextRenderer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBFONTMANAGER_OPTIMIZATION := HIGHEST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11TextRenderer.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontpath.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -969,6 +967,9 @@ ifndef OPENJDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# For now -lawt_headless is dropped below in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY := t2k, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -987,7 +988,7 @@ ifndef OPENJDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(call SET_SHARED_LIBRARY_ORIGIN), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS_SUFFIX_solaris := -lawt, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_FLAGS := $(RC_FLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D "JDK_FNAME=t2k.dll" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1043,17 +1044,17 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else # OPENJDK_TARGET_OS not windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAWT_FILES := jawt.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAWT_LIBS := -lawt_lwawt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAWT_FILES := jawt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAWT_LIBS :=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(OPENJDK_TARGET_OS), solaris)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JAWT_LIBS += -lawt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ JAWT_LIBS +=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JAWT_LIBS += -lawt_xawt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ JAWT_LIBS +=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAWT_LIBS += -lawt_headless
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADLESS_CFLAG += -DHEADLESS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1089,7 +1090,7 @@ else # OPENJDK_TARGET_OS not windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1149,7 +1150,7 @@ ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifneq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifneq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1165,7 +1166,7 @@ ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBSPLASHSCREEN_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1192,16 +1193,15 @@ ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework ApplicationServices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Foundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaNativeFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ifeq ($(OPENJDK_TARGET_OS), windows)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -liconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1227,7 +1227,7 @@ ifndef BUILD_HEADLESS_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1276,7 +1276,7 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBAWT_LWAWT_FILES := \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ awt.m \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1383,7 +1383,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS := $(LDFLAGS_JDKLIB) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(call SET_SHARED_LIBRARY_ORIGIN), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS_SUFFIX_macosx := -lawt -losxapp -ljvm $(LIBM) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Accelerate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework ApplicationServices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework AudioToolbox \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1391,10 +1391,8 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Security \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework ExceptionHandling \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaNativeFoundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaRuntimeSupport \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework OpenGL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework QuartzCore -ljava, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -framework QuartzCore, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1412,7 +1410,7 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY := osxui, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1431,8 +1429,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Carbon \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework ApplicationServices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaNativeFoundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaRuntimeSupport \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ljava -ljvm, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/make/lib/PlatformLibraries.gmk jdk/make/lib/PlatformLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 49f584b447..07f2e6408d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/make/lib/PlatformLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/make/lib/PlatformLibraries.gmk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # questions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY := AppleScriptEngine, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(call SET_SHARED_LIBRARY_ORIGIN), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SUFFIX := -framework Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Carbon \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaNativeFoundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LDFLAGS_JDKLIB_SUFFIX), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +49,7 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY := osxapp, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,8 +70,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Security \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework ExceptionHandling \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaNativeFoundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaRuntimeSupport \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework OpenGL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework IOSurface \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework QuartzCore, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +82,7 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(OPENJDK_TARGET_OS), macosx_lion_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBOSX_DIRS := \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,8 +106,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -losxapp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework ApplicationServices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaNativeFoundation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -framework JavaRuntimeSupport \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework Security \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework SystemConfiguration \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LDFLAGS_JDKLIB_SUFFIX), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/macosx/bin/java_md_macosx.c jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 89210cb708..a319e65a35 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -307,7 +307,9 @@ static int (*main_fptr)(int argc, char **argv) = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void *apple_main (void *arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __POWERPC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc_registerThreadWithCollector();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (main_fptr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main_fptr = (int (*)())dlsym(RTLD_DEFAULT, "main");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -923,7 +925,9 @@ JLI_GetJavaVMInstance()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RegisterThread()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __POWERPC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc_registerThreadWithCollector();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_PCM.cpp jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_PCM.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 608ee13d7e..8222438ae9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_PCM.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_PCM.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AudioToolbox/AudioConverter.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pthread.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(__COREAUDIO_USE_FLAT_INCLUDES__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreAudio/CoreAudioTypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -620,7 +621,9 @@ struct OSX_DirectAudioDevice {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~OSX_DirectAudioDevice() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (audioUnit) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioComponentInstanceDispose(audioUnit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (resampler) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete resampler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -630,6 +633,7 @@ struct OSX_DirectAudioDevice {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static AudioUnit CreateOutputUnit(AudioDeviceID deviceID, int isSource)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSStatus err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioUnit unit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -683,6 +687,9 @@ static AudioUnit CreateOutputUnit(AudioDeviceID deviceID, int isSource)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return unit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static OSStatus OutputCallback(void *inRefCon,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/macosx/native/sun/font/AWTFont.m jdk/src/macosx/native/sun/font/AWTFont.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b392022f76..baec124f33 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/macosx/native/sun/font/AWTFont.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/macosx/native/sun/font/AWTFont.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,24 +397,6 @@ Java_sun_font_CFontManager_loadNativeFonts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "(Ljava/lang/String;Ljava/lang/String;)V");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jint num = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_ENTER(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSArray *filteredFonts = GetFilteredFonts();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- num = (jint)[filteredFonts count];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = 0; i < num; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString *fontname = [filteredFonts objectAtIndex:i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jobject jFontName = JNFNSToJavaString(env, fontname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jobject jFontFamilyName =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNFNSToJavaString(env, GetFamilyNameForFontName(fontname));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNFCallVoidMethod(env, jthis,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jm_registerFont, jFontName, jFontFamilyName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_EXIT(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,22 +408,7 @@ JNIEXPORT void JNICALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Java_sun_font_CFontManager_loadNativeDirFonts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (JNIEnv *env, jclass clz, jstring filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_ENTER(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString *nsFilePath = JNFJavaToNSString(env, filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FSRef iFile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OSStatus status = CreateFSRef(&iFile, nsFilePath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (status == noErr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ATSFontContainerRef oContainer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status = ATSFontActivateFromFileReference(&iFile, kATSFontContextLocal,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kATSFontFormatUnspecified,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NULL, kNilOptions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- &oContainer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_EXIT(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma mark --- sun.font.CFont JNI ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -488,49 +455,6 @@ Java_sun_font_CFont_getTableBytesNative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jlong awtFontPtr, jint jtag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jbyteArray jbytes = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_ENTER(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CTFontTableTag tag = (CTFontTableTag)jtag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i, found = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSFont* nsFont = awtFont->fFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CTFontRef ctfont = (CTFontRef)nsFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFArrayRef tagsArray =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CTFontCopyAvailableTables(ctfont, kCTFontTableOptionNoOptions);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFIndex numTags = CFArrayGetCount(tagsArray);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i=0; i<numTags; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (tag ==
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (CTFontTableTag)(uintptr_t)CFArrayGetValueAtIndex(tagsArray, i)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- found = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFRelease(tagsArray);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!found) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFDataRef table = CTFontCopyTable(ctfont, tag, kCTFontTableOptionNoOptions);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (table == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *tableBytes = (char*)(CFDataGetBytePtr(table));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t tableLength = CFDataGetLength(table);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (tableBytes == NULL || tableLength == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFRelease(table);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jbytes = (*env)->NewByteArray(env, (jsize)tableLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (jbytes == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (*env)->SetByteArrayRegion(env, jbytes, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (jsize)tableLength,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (jbyte*)tableBytes);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFRelease(table);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_EXIT(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return jbytes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -547,18 +471,6 @@ Java_sun_font_CFont_createNativeFont
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AWTFont *awtFont = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_ENTER(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- awtFont =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AWTFont awtFontForName:JNFJavaToNSString(env, nativeFontName)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- style:style]; // autoreleased
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (awtFont) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFRetain(awtFont); // GC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_EXIT(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ptr_to_jlong(awtFont);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -572,17 +484,8 @@ Java_sun_font_CFont_getWidthNative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (JNIEnv *env, jobject cfont, jlong awtFontPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float widthVal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_ENTER(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSFont* nsFont = awtFont->fFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSFontDescriptor *fontDescriptor = nsFont.fontDescriptor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSDictionary *fontTraits = [fontDescriptor objectForKey : NSFontTraitsAttribute];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSNumber *width = [fontTraits objectForKey : NSFontWidthTrait];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- widthVal = (float)[width floatValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JNF_COCOA_EXIT(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (jfloat)widthVal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (jfloat)widthVal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/share/classes/sun/nio/ch/SocketOptionRegistry.java.template jdk/src/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c0286d1795..7513f93494 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,8 +114,6 @@ class SocketOptionRegistry {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef AF_INET6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // IPPROTO_IPV6 is 41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_TOS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StandardProtocolFamily.INET6), new OptionKey(41, IPV6_TCLASS));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_MULTICAST_IF,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StandardProtocolFamily.INET6), new OptionKey(41, IPV6_MULTICAST_IF));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_MULTICAST_TTL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/share/native/sun/font/AccelGlyphCache.c jdk/src/share/native/sun/font/AccelGlyphCache.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 67729ad7ec..bcdeaa5de7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/share/native/sun/font/AccelGlyphCache.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/share/native/sun/font/AccelGlyphCache.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,12 +66,12 @@ AccelGlyphCache_Init(jint width, jint height,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GlyphCacheInfo *gcinfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- J2dTraceLn(J2D_TRACE_INFO, "AccelGlyphCache_Init");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// J2dTraceLn(J2D_TRACE_INFO, "AccelGlyphCache_Init");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcinfo = (GlyphCacheInfo *)malloc(sizeof(GlyphCacheInfo));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gcinfo == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- J2dRlsTraceLn(J2D_TRACE_ERROR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "AccelGlyphCache_Init: could not allocate GlyphCacheInfo");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// J2dRlsTraceLn(J2D_TRACE_ERROR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// "AccelGlyphCache_Init: could not allocate GlyphCacheInfo");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/java/net/net_util_md.c jdk/src/solaris/native/java/net/net_util_md.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bd0bd8c2c9..c4c029c1bf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/java/net/net_util_md.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/java/net/net_util_md.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1026,7 +1026,7 @@ NET_MapSocketOption(jint cmd, int *level, int *optname) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *level = IPPROTO_IPV6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *optname = IPV6_MULTICAST_LOOP;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (defined(__solaris__) || defined(MACOSX))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__solaris__) || (defined(MACOSX) && !defined(__POWERPC__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Map IP_TOS request to IPV6_TCLASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case java_net_SocketOptions_IP_TOS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *level = IPPROTO_IPV6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/sun/awt/CUPSfuncs.c jdk/src/solaris/native/sun/awt/CUPSfuncs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ce8350dec3..ab3f891b35 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/sun/awt/CUPSfuncs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/sun/awt/CUPSfuncs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,9 +173,9 @@ Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (server != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Is this a local domain socket?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (strncmp(server, "/", 1) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cServer = JNU_NewStringPlatform(env, "localhost");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// cServer = JNU_NewStringPlatform(env, "localhost");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cServer = JNU_NewStringPlatform(env, server);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// cServer = JNU_NewStringPlatform(env, server);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return cServer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,7 +211,7 @@ Java_sun_print_CUPSPrinter_getCupsDefaultPrinter(JNIEnv *env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dest != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaultPrinter = dest->name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (defaultPrinter != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cDefPrinter = JNU_NewStringPlatform(env, defaultPrinter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// cDefPrinter = JNU_NewStringPlatform(env, defaultPrinter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j2d_cupsFreeDests(num_dests, dests);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,7 +263,7 @@ Java_sun_print_CUPSPrinter_getMedia(JNIEnv *env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = (*env)->GetStringUTFChars(env, printer, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (name == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->ExceptionClear(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "Could not create printer name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "Could not create printer name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,28 +299,28 @@ Java_sun_print_CUPSPrinter_getMedia(JNIEnv *env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j2d_ppdClose(ppd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DPRINTF("CUPSfuncs::bad alloc new array\n", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->ExceptionClear(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; optionPage!=NULL && i<nPages; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ choice = (optionPage->choices)+i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- utf_str = JNU_NewStringPlatform(env, choice->text);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// utf_str = JNU_NewStringPlatform(env, choice->text);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (utf_str == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlink(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j2d_ppdClose(ppd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DPRINTF("CUPSfuncs::bad alloc new string ->text\n", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->SetObjectArrayElement(env, nameArray, i*2, utf_str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->DeleteLocalRef(env, utf_str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- utf_str = JNU_NewStringPlatform(env, choice->choice);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// utf_str = JNU_NewStringPlatform(env, choice->choice);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (utf_str == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlink(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j2d_ppdClose(ppd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DPRINTF("CUPSfuncs::bad alloc new string ->choice\n", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->SetObjectArrayElement(env, nameArray, i*2+1, utf_str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,23 +329,23 @@ Java_sun_print_CUPSPrinter_getMedia(JNIEnv *env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; optionTray!=NULL && i<nTrays; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ choice = (optionTray->choices)+i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- utf_str = JNU_NewStringPlatform(env, choice->text);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// utf_str = JNU_NewStringPlatform(env, choice->text);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (utf_str == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlink(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j2d_ppdClose(ppd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DPRINTF("CUPSfuncs::bad alloc new string text\n", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->SetObjectArrayElement(env, nameArray,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (nPages+i)*2, utf_str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->DeleteLocalRef(env, utf_str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- utf_str = JNU_NewStringPlatform(env, choice->choice);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// utf_str = JNU_NewStringPlatform(env, choice->choice);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (utf_str == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlink(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j2d_ppdClose(ppd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DPRINTF("CUPSfuncs::bad alloc new string choice\n", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->SetObjectArrayElement(env, nameArray,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -375,7 +375,7 @@ Java_sun_print_CUPSPrinter_getPageSizes(JNIEnv *env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *name = (*env)->GetStringUTFChars(env, printer, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (name == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->ExceptionClear(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "Could not create printer name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "Could not create printer name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *filename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -405,7 +405,7 @@ Java_sun_print_CUPSPrinter_getPageSizes(JNIEnv *env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j2d_ppdClose(ppd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DPRINTF("CUPSfuncs::bad alloc new float array\n", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->ExceptionClear(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -414,7 +414,7 @@ Java_sun_print_CUPSPrinter_getPageSizes(JNIEnv *env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlink(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j2d_ppdClose(ppd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->ExceptionClear(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "Could not create printer name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// JNU_ThrowOutOfMemoryError(env, "Could not create printer name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i<option->num_choices; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/sun/awt/HeadlessToolkit.c jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fd17f3b87f..a2f113aba8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@ extern JavaVM *jvm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JNIEXPORT jint JNICALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JNI_OnLoad(JavaVM *vm, void *reserved)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jvm = vm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// jvm = vm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return JNI_VERSION_1_2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5948302713..01158ddec3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,13 +85,13 @@ JNIEXPORT jboolean JNICALL AWTIsHeadless() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Pathnames to the various awt toolkits
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef MACOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MACOSX) && !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LWAWT_PATH "/libawt_lwawt.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DEFAULT_PATH LWAWT_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #define XAWT_PATH "/libawt_xawt.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define XAWT_PATH "/libawt_xawt.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DEFAULT_PATH XAWT_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #define HEADLESS_PATH "/libawt_headless.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define HEADLESS_PATH "/libawt_headless.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,7 +130,7 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmProp = (*env)->NewStringUTF(env, "sun.font.fontmanager");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_EXCEPTION_FATAL(env, "Could not allocate font manager property");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef MACOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MACOSX) && !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmanager = (*env)->NewStringUTF(env, "sun.font.CFontManager");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tk = LWAWT_PATH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +146,7 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_EXCEPTION_FATAL(env, "Could not allocate set properties");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef MACOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(MACOSX) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (AWTIsHeadless()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tk = HEADLESS_PATH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/sun/awt/fontpath.c jdk/src/solaris/native/sun/awt/fontpath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 66db1911f2..c533b4aab8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/sun/awt/fontpath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/sun/awt/fontpath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -636,6 +636,11 @@ static void* openFontConfig() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (libfontconfig == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libfontconfig = dlopen(FONTCONFIG_DLL, RTLD_LOCAL|RTLD_LAZY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (libfontconfig == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf("MAC PPC: port we failed to load the library %s\n",FONTCONFIG_DLL_VERSIONED);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf("MAC PPC: you need to explicitly put this library in your jdk lib factory\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf("MAC PPC: you might have to upde the build sript to add the correct copy action at build\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf("MAC PPC: expect java to crash with some null pointer exception...\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "MAC PPC: error: %s\n", dlerror());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1151,7 +1156,7 @@ Java_sun_font_FontConfigManager_getFontConfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ locale = (*env)->GetStringUTFChars(env, localeStr, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (locale == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*env)->ExceptionClear(env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JNU_ThrowOutOfMemoryError(env, "Could not create locale");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // JNU_ThrowOutOfMemoryError(env, "Could not create locale");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/sun/awt/jawt.c jdk/src/solaris/native/sun/awt/jawt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 64284bc6e9..1ed9c44048 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/sun/awt/jawt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/sun/awt/jawt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(JAVASE_EMBEDDED) && defined(HEADLESS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(JAVASE_EMBEDDED) && defined(HEADLESS) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* there are no AWT libs available at all */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return JNI_FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ff1290756f..730ff52c86 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __solaris__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rv = connect(fd, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // On macOS systems we use disconnectx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rv = disconnectx(fd, SAE_ASSOCID_ANY, SAE_CONNID_ANY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__linux__) || defined(_ALLBSD_SOURCE) || defined(_AIX)
</span></pre><pre style='margin:0'>
</pre>