<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f529d26a97de05012b8100b9eae68e8da10f740d">https://github.com/macports/macports-ports/commit/f529d26a97de05012b8100b9eae68e8da10f740d</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 f529d26a97d openjdk8: fix configure on arm64
</span>f529d26a97d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f529d26a97de05012b8100b9eae68e8da10f740d
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Fri Jun 2 18:29:01 2023 +0530
<span style='display:block; white-space:pre;color:#404040;'> openjdk8: fix configure on arm64
</span>---
java/openjdk8/Portfile | 8 +-
.../Support-arm64-and-fix-zero-assembler.diff | 182 +++++++++++++++++----
2 files changed, 152 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/Portfile b/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b3219aac72a..c0796ba2a3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ set update 372
</span> # Set to the build of the 'jdk8u${update}-b${build}' tag that corresponds to the latest tag with '-ga'
set build 07
version ${major}u${update}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories java devel
supported_archs ppc x86_64 arm64
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,11 +54,9 @@ depends_build port:autoconf \
</span> set tpath /Library/Java
use_xcode yes
use_configure yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} in [list i386 ppc]} {
</span> set datamodel 32
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set datamodel 64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> set datamodel 64
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/files/Support-arm64-and-fix-zero-assembler.diff b/java/openjdk8/files/Support-arm64-and-fix-zero-assembler.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c1f56450b3f..be1fdc5ece2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8/files/Support-arm64-and-fix-zero-assembler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8/files/Support-arm64-and-fix-zero-assembler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,141 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 13838d9d34..d45973a917 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 73b2e76511e..8b321480193 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/autoconf/flags.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/autoconf/flags.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -705,6 +705,10 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # command line.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "$OPENJDK_TARGET_CPU_ARCH" = "xaarch64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS_JDK="${CFLAGS_JDK} -arch arm64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS_JDK="${LDFLAGS_JDK} -arch arm64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</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;'>+diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b0b30333936..a2ae79c0402 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;'>+@@ -13673,10 +13673,20 @@ test -n "$target_alias" &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_ARCH=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_BITS=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$2" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ARCH=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ENDIAN=little
</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;'>++ VAR_CPU=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ARCH=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_BITS=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aarch64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VAR_CPU=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13811,10 +13821,20 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_ARCH=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_BITS=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$2" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ARCH=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ENDIAN=little
</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;'>++ VAR_CPU=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ARCH=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_BITS=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aarch64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VAR_CPU=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 51df988f619..c51829f5f24 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/autoconf/platform.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/autoconf/platform.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,11 +43,20 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_ARCH=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_BITS=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$2" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ARCH=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ENDIAN=little
</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;'>++ VAR_CPU=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ARCH=arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_BITS=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VAR_CPU_ENDIAN=little
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aarch64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VAR_CPU=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VAR_CPU_ARCH=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -168,7 +177,7 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu, $build_os)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ..and setup our own variables. (Do this explicitely to facilitate searching)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENJDK_BUILD_OS="$VAR_OS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENJDK_BUILD_OS_API="$VAR_OS_API"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,7 +199,7 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLATFORM_EXTRACT_VARS_FROM_OS($host_os)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu, $host_os)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ... and setup our own variables. (Do this explicitely to facilitate searching)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENJDK_TARGET_OS="$VAR_OS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENJDK_TARGET_OS_API="$VAR_OS_API"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 13838d9d34e..d45973a9171 100644
</span> --- hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+++ hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
@@ -370,7 +370,7 @@ int CppInterpreter::native_entry(Method* method, intptr_t UNUSED, TRAPS) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> // Make the call
intptr_t result[4 - LogBytesPerWord];
- ffi_call(handler->cif(), (void (*)()) function, result, arguments);
+ ffi_call(handler->cif(), CAST_TO_FN_PTR(void (*)(), function), result, arguments);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> // Change the thread state back to _thread_in_Java.
// ThreadStateTransition::transition_from_native() cannot be used
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 9bbabfbcf9..a0ae9201f8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9bbabfbcf90..a0ae9201f8a 100644
</span> --- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
@@ -381,42 +381,42 @@ extern "C" {
return 1;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
+ void _Copy_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) {
if (from > to) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +187,7 @@ index 9bbabfbcf9..a0ae9201f8 100644
</span> @@ -424,22 +424,22 @@ extern "C" {
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - void _Copy_arrayof_conjoint_bytes(HeapWord* from,
+ void _Copy_arrayof_conjoint_bytes(const HeapWord* from,
HeapWord* to,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,14 +211,14 @@ index 9bbabfbcf9..a0ae9201f8 100644
</span> HeapWord* to,
size_t count) {
memmove(to, from, count * 8);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 84d29b2113..a71f4b7855 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 84d29b21131..a71f4b78556 100644
</span> --- hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -412,42 +412,42 @@ extern "C" {
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
+ void _Copy_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) {
if (from > to) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +270,7 @@ index 84d29b2113..a71f4b7855 100644
</span> @@ -455,22 +455,22 @@ extern "C" {
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - void _Copy_arrayof_conjoint_bytes(HeapWord* from,
+ void _Copy_arrayof_conjoint_bytes(const HeapWord* from,
HeapWord* to,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,8 +294,8 @@ index 84d29b2113..a71f4b7855 100644
</span> HeapWord* to,
size_t count) {
memmove(to, from, count * 8);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git hotspot/src/share/vm/runtime/java.cpp hotspot/src/share/vm/runtime/java.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0a263b017c..b36671fb2d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0a263b017cf..b36671fb2d7 100644
</span> --- hotspot/src/share/vm/runtime/java.cpp
+++ hotspot/src/share/vm/runtime/java.cpp
@@ -60,6 +60,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,12 +306,12 @@ index 0a263b017c..b36671fb2d 100644
</span> #include "services/memTracker.hpp"
#include "utilities/dtrace.hpp"
#include "utilities/globalDefinitions.hpp"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git hotspot/src/share/vm/runtime/sharedRuntime.cpp hotspot/src/share/vm/runtime/sharedRuntime.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5f540247f9..41e3dc9254 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5f540247f9b..41e3dc92548 100644
</span> --- hotspot/src/share/vm/runtime/sharedRuntime.cpp
+++ hotspot/src/share/vm/runtime/sharedRuntime.cpp
@@ -108,12 +108,14 @@ UncommonTrapBlob* SharedRuntime::_uncommon_trap_blob;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> //----------------------------generate_stubs-----------------------------------
void SharedRuntime::generate_stubs() {
+#ifndef ZERO
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,7 +322,7 @@ index 5f540247f9..41e3dc9254 100644
</span> _resolve_virtual_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_virtual_call_C), "resolve_virtual_call");
_resolve_static_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_static_call_C), "resolve_static_call");
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifdef COMPILER2
// Vectors are generated only by C2.
@@ -2384,7 +2386,12 @@ void AdapterHandlerLibrary::initialize() {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,8 +339,8 @@ index 5f540247f9..41e3dc9254 100644
</span> _abstract_method_handler = AdapterHandlerLibrary::new_entry(new AdapterFingerPrint(0, NULL),
StubRoutines::throw_AbstractMethodError_entry(),
wrong_method_abstract, wrong_method_abstract);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git hotspot/src/share/vm/runtime/stubRoutines.cpp hotspot/src/share/vm/runtime/stubRoutines.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d943248da0..5fc5f7618b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hotspot/src/share/vm/runtime/stubRoutines.cpp b/hotspot/src/share/vm/runtime/stubRoutines.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d943248da0f..5fc5f7618bf 100644
</span> --- hotspot/src/share/vm/runtime/stubRoutines.cpp
+++ hotspot/src/share/vm/runtime/stubRoutines.cpp
@@ -201,18 +201,21 @@ static void test_arraycopy_func(address func, int alignment) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,8 +368,8 @@ index d943248da0..5fc5f7618b 100644
</span> for (i = 0; i < sizeof(lbuffer); i++) {
assert(fbuffer[i] == v && fbuffer2[i] == v2, "shouldn't have copied anything");
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git hotspot/src/share/vm/runtime/virtualspace.cpp hotspot/src/share/vm/runtime/virtualspace.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 66392b75f1..521afe6b1c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hotspot/src/share/vm/runtime/virtualspace.cpp b/hotspot/src/share/vm/runtime/virtualspace.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 66392b75f13..521afe6b1c8 100644
</span> --- hotspot/src/share/vm/runtime/virtualspace.cpp
+++ hotspot/src/share/vm/runtime/virtualspace.cpp
@@ -356,7 +356,12 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,9 +384,9 @@ index 66392b75f1..521afe6b1c 100644
</span> +#endif
MemTracker::record_virtual_memory_type((address)base(), mtCode);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 6aa0eb588a..098c229bf3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/jdk/src/macosx/bin/java_md_macosx.c b/jdk/src/macosx/bin/java_md_macosx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6aa0eb588ae..098c229bf36 100644
</span> --- jdk/src/macosx/bin/java_md_macosx.c
+++ jdk/src/macosx/bin/java_md_macosx.c
@@ -228,6 +228,8 @@ static InvocationFunctions *GetExportedJNIFunctions() {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,8 +398,8 @@ index 6aa0eb588a..098c229bf3 100644
</span> #else
#error "Unknown architecture - needs definition"
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git jdk/src/macosx/native/sun/awt/AWTView.m jdk/src/macosx/native/sun/awt/AWTView.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 29dd6410ea..cd43be6bc4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/jdk/src/macosx/native/sun/awt/AWTView.m b/jdk/src/macosx/native/sun/awt/AWTView.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 29dd6410eaf..cd43be6bc43 100644
</span> --- jdk/src/macosx/native/sun/awt/AWTView.m
+++ jdk/src/macosx/native/sun/awt/AWTView.m
@@ -37,7 +37,6 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,12 +408,12 @@ index 29dd6410ea..cd43be6bc4 100644
</span> #import "GeomUtilities.h"
-#import "OSVersion.h"
#import "CGLLayer.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> @interface AWTView()
@@ -54,13 +53,6 @@ -(BOOL) isCodePointInUnicodeBlockNeedingIMEvent: (unichar) codePoint;
//#define IM_DEBUG TRUE
//#define EXTRA_DEBUG
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -static BOOL shouldUsePressAndHold() {
- static int shouldUsePressAndHold = -1;
- if (shouldUsePressAndHold != -1) return shouldUsePressAndHold;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -305,14 +422,13 @@ index 29dd6410ea..cd43be6bc4 100644
</span> -}
-
@implementation AWTView
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> @synthesize _dropTarget;
@@ -83,7 +75,7 @@ - (id) initWithRect: (NSRect) rect
fKeyEventsNeeded = NO;
fProcessingKeystroke = NO;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - fEnablePressAndHold = shouldUsePressAndHold();
+ fEnablePressAndHold = YES;
fInPressAndHold = NO;
fPAHNeedsToSelect = NO;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>