|
 |
9bf359 |
--- /dev/null
|
|
|
9bf359 |
+++ jdk8/jdk/src/solaris/bin/aarch64/jvm.cfg
|
|
|
9bf359 |
@@ -0,0 +1,2 @@
|
|
|
9bf359 |
+-server KNOWN
|
|
|
9bf359 |
+-client IGNORE
|
|
|
9bf359 |
--- jdk8/common/autoconf/generated-configure.sh
|
|
|
9bf359 |
+++ jdk8/common/autoconf/generated-configure.sh
|
|
|
9bf359 |
@@ -6731,8 +6731,9 @@
|
|
|
9bf359 |
# The aliases save the names the user supplied, while $host etc.
|
|
|
9bf359 |
# will get canonicalized.
|
|
|
9bf359 |
test -n "$target_alias" &&
|
|
|
9bf359 |
- test "$program_prefix$program_suffix$program_transform_name" = \
|
|
|
9bf359 |
- NONENONEs,x,x, &&
|
|
|
9bf359 |
+ test "$target_alias" != "$host_alias" &&
|
|
|
9bf359 |
+ test "$program_prefix$program_suffix$program_transform_name" = \
|
|
|
9bf359 |
+ NONENONEs,x,x, &&
|
|
|
9bf359 |
program_prefix=${target_alias}-
|
|
|
9bf359 |
|
|
|
9bf359 |
# Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
|
|
|
9bf359 |
@@ -6816,6 +6817,12 @@
|
|
|
9bf359 |
VAR_CPU=arm
|
|
|
9bf359 |
VAR_CPU_ARCH=arm
|
|
|
9bf359 |
VAR_CPU_BITS=32
|
|
|
9bf359 |
+ VAR_CPU_ENDIAN=little
|
|
|
9bf359 |
+ ;;
|
|
|
9bf359 |
+ aarch64)
|
|
|
9bf359 |
+ VAR_CPU=aarch64
|
|
|
9bf359 |
+ VAR_CPU_ARCH=aarch64
|
|
|
9bf359 |
+ VAR_CPU_BITS=64
|
|
|
9bf359 |
VAR_CPU_ENDIAN=little
|
|
|
9bf359 |
;;
|
|
|
9bf359 |
powerpc)
|
|
|
9bf359 |
@@ -6949,6 +6956,12 @@
|
|
|
9bf359 |
VAR_CPU_BITS=32
|
|
|
9bf359 |
VAR_CPU_ENDIAN=little
|
|
|
9bf359 |
;;
|
|
|
9bf359 |
+ aarch64)
|
|
|
9bf359 |
+ VAR_CPU=aarch64
|
|
|
9bf359 |
+ VAR_CPU_ARCH=aarch64
|
|
|
9bf359 |
+ VAR_CPU_BITS=64
|
|
|
9bf359 |
+ VAR_CPU_ENDIAN=little
|
|
|
9bf359 |
+ ;;
|
|
|
9bf359 |
powerpc)
|
|
|
9bf359 |
VAR_CPU=ppc
|
|
|
9bf359 |
VAR_CPU_ARCH=ppc
|
|
|
9bf359 |
@@ -7950,6 +7963,9 @@
|
|
|
9bf359 |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
|
|
|
9bf359 |
INCLUDE_SA=false
|
|
|
9bf359 |
fi
|
|
|
9bf359 |
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
|
|
|
9bf359 |
+ INCLUDE_SA=false
|
|
|
9bf359 |
+ fi
|
|
|
9bf359 |
if test "x$VAR_CPU" = xppc64 ; then
|
|
|
9bf359 |
INCLUDE_SA=false
|
|
|
9bf359 |
fi
|
|
|
9bf359 |
@@ -29957,6 +29973,9 @@
|
|
|
9bf359 |
s390)
|
|
|
9bf359 |
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
|
|
|
9bf359 |
;;
|
|
|
9bf359 |
+ aarch64)
|
|
|
9bf359 |
+ ZERO_ARCHFLAG=""
|
|
|
9bf359 |
+ ;;
|
|
|
9bf359 |
*)
|
|
|
9bf359 |
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
|
|
|
9bf359 |
esac
|
|
|
9bf359 |
--- jdk8/common/autoconf/jdk-options.m4
|
|
|
9bf359 |
+++ jdk8/common/autoconf/jdk-options.m4
|
|
|
d934b5 |
@@ -119,7 +119,9 @@
|
|
|
9bf359 |
|
|
|
d934b5 |
if test "x$JVM_VARIANT_CLIENT" = xtrue; then
|
|
|
d934b5 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
|
|
|
9bf359 |
- AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
|
|
|
d934b5 |
+ if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
|
|
|
d934b5 |
+ AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
|
|
|
d934b5 |
+ fi
|
|
|
d934b5 |
fi
|
|
|
d934b5 |
fi
|
|
|
9bf359 |
if test "x$JVM_VARIANT_KERNEL" = xtrue; then
|
|
|
9bf359 |
@@ -159,6 +154,9 @@
|
|
|
9bf359 |
INCLUDE_SA=false
|
|
|
9bf359 |
fi
|
|
|
9bf359 |
if test "x$VAR_CPU" = xppc64 ; then
|
|
|
9bf359 |
+ INCLUDE_SA=false
|
|
|
9bf359 |
+ fi
|
|
|
9bf359 |
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
|
|
|
9bf359 |
INCLUDE_SA=false
|
|
|
9bf359 |
fi
|
|
|
9bf359 |
AC_SUBST(INCLUDE_SA)
|
|
|
9bf359 |
@@ -460,12 +458,6 @@
|
|
|
9bf359 |
AC_MSG_ERROR([Update version must have a value])
|
|
|
9bf359 |
elif test "x$with_update_version" != x; then
|
|
|
9bf359 |
JDK_UPDATE_VERSION="$with_update_version"
|
|
|
9bf359 |
- # On macosx 10.7, it's not possible to set --with-update-version=0X due
|
|
|
9bf359 |
- # to a bug in expr (which reduces it to just X). To work around this, we
|
|
|
9bf359 |
- # always add a 0 to one digit update versions.
|
|
|
9bf359 |
- if test "${#JDK_UPDATE_VERSION}" = "1"; then
|
|
|
9bf359 |
- JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}"
|
|
|
9bf359 |
- fi
|
|
|
9bf359 |
fi
|
|
|
9bf359 |
|
|
|
9bf359 |
AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
|
|
|
9bf359 |
--- jdk8/common/autoconf/platform.m4
|
|
|
9bf359 |
+++ jdk8/common/autoconf/platform.m4
|
|
|
9bf359 |
@@ -46,6 +46,12 @@
|
|
|
9bf359 |
VAR_CPU=arm
|
|
|
9bf359 |
VAR_CPU_ARCH=arm
|
|
|
9bf359 |
VAR_CPU_BITS=32
|
|
|
9bf359 |
+ VAR_CPU_ENDIAN=little
|
|
|
9bf359 |
+ ;;
|
|
|
9bf359 |
+ aarch64)
|
|
|
9bf359 |
+ VAR_CPU=aarch64
|
|
|
9bf359 |
+ VAR_CPU_ARCH=aarch64
|
|
|
9bf359 |
+ VAR_CPU_BITS=64
|
|
|
9bf359 |
VAR_CPU_ENDIAN=little
|
|
|
9bf359 |
;;
|
|
|
9bf359 |
powerpc)
|
|
|
9bf359 |
--- jdk8/common/autoconf/toolchain.m4
|
|
|
9bf359 |
+++ jdk8/common/autoconf/toolchain.m4
|
|
|
9bf359 |
@@ -1158,6 +1158,9 @@
|
|
|
9bf359 |
s390)
|
|
|
9bf359 |
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
|
|
|
9bf359 |
;;
|
|
|
9bf359 |
+ aarch64)
|
|
|
9bf359 |
+ ZERO_ARCHFLAG=""
|
|
|
9bf359 |
+ ;;
|
|
|
9bf359 |
*)
|
|
|
9bf359 |
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
|
|
|
9bf359 |
esac
|
|
|
9bf359 |
--- jdk8/jdk/make/lib/SoundLibraries.gmk
|
|
|
9bf359 |
+++ jdk8/jdk/make/lib/SoundLibraries.gmk
|
|
|
9bf359 |
@@ -138,6 +138,10 @@
|
|
|
9bf359 |
|
|
|
9bf359 |
ifeq ($(OPENJDK_TARGET_CPU), ppc64)
|
|
|
9bf359 |
LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
|
|
|
9bf359 |
+ endif
|
|
|
9bf359 |
+
|
|
|
9bf359 |
+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
|
|
|
9bf359 |
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
|
|
|
9bf359 |
endif
|
|
|
9bf359 |
endif
|
|
|
9bf359 |
|
|
|
9bf359 |
--- jdk8/jdk/make/CompileJavaClasses.gmk
|
|
|
9bf359 |
+++ jdk8/jdk/make/CompileJavaClasses.gmk
|
|
|
9bf359 |
@@ -390,7 +390,7 @@
|
|
|
9bf359 |
|
|
|
9bf359 |
##########################################################################################
|
|
|
9bf359 |
|
|
|
9bf359 |
-all: $(BUILD_JDK) $(BUILD_SECURITY) $(COPY_EXTRA) \
|
|
|
9bf359 |
+all: $(BUILD_JDK) $(BUILD_SECURITY) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
|
|
|
9bf359 |
$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
|
|
|
9bf359 |
$(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
|
|
|
9bf359 |
$(BUILD_ACCESSBRIDGE_LEGACY)
|