< prev index next >
make/autoconf/platform.m4
Print this page
rev 59189 : imported patch build
rev 59191 : imported patch build-02
*** 148,169 ****
VAR_CPU=sh
VAR_CPU_ARCH=sh
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=little
;;
- sparc)
- VAR_CPU=sparc
- VAR_CPU_ARCH=sparc
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=big
- ;;
- sparcv9|sparc64)
- VAR_CPU=sparcv9
- VAR_CPU_ARCH=sparc
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=big
- ;;
*)
AC_MSG_ERROR([unsupported cpu $1])
;;
esac
])
--- 148,157 ----
*** 176,189 ****
case "$1" in
*linux*)
VAR_OS=linux
VAR_OS_TYPE=unix
;;
- *solaris*)
- VAR_OS=solaris
- VAR_OS_TYPE=unix
- ;;
*darwin*)
VAR_OS=macosx
VAR_OS_TYPE=unix
;;
*bsd*)
--- 164,173 ----
*** 322,335 ****
# A reduced build is requested
COMPILE_TYPE="reduced"
OPENJDK_TARGET_CPU_BITS=32
if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
OPENJDK_TARGET_CPU=x86
- elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
- OPENJDK_TARGET_CPU=sparc
else
! AC_MSG_ERROR([Reduced build (--with-target-bits=32) is only supported on x86_64 and sparcv9])
fi
elif test "x$with_target_bits" = x64 && test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
AC_MSG_ERROR([It is not possible to use --with-target-bits=64 on a 32 bit system. Use proper cross-compilation instead.])
elif test "x$with_target_bits" = "x$OPENJDK_TARGET_CPU_BITS"; then
AC_MSG_NOTICE([--with-target-bits are set to build platform address size; argument has no meaning])
--- 306,317 ----
# A reduced build is requested
COMPILE_TYPE="reduced"
OPENJDK_TARGET_CPU_BITS=32
if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
OPENJDK_TARGET_CPU=x86
else
! AC_MSG_ERROR([Reduced build (--with-target-bits=32) is only supported on x86_64])
fi
elif test "x$with_target_bits" = x64 && test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
AC_MSG_ERROR([It is not possible to use --with-target-bits=64 on a 32 bit system. Use proper cross-compilation instead.])
elif test "x$with_target_bits" = "x$OPENJDK_TARGET_CPU_BITS"; then
AC_MSG_NOTICE([--with-target-bits are set to build platform address size; argument has no meaning])
*** 379,401 ****
elif test "x$OPENJDK_$1_CPU" = xx86_64; then
OPENJDK_$1_CPU_LEGACY_LIB="amd64"
fi
AC_SUBST(OPENJDK_$1_CPU_LEGACY_LIB)
- # OPENJDK_$1_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
- # /amd64 or /sparcv9. This string is appended to some library paths, like this:
- # /usr/lib${OPENJDK_$1_CPU_ISADIR}/libexample.so
- OPENJDK_$1_CPU_ISADIR=""
- if test "x$OPENJDK_$1_OS" = xsolaris; then
- if test "x$OPENJDK_$1_CPU" = xx86_64; then
- OPENJDK_$1_CPU_ISADIR="/amd64"
- elif test "x$OPENJDK_$1_CPU" = xsparcv9; then
- OPENJDK_$1_CPU_ISADIR="/sparcv9"
- fi
- fi
- AC_SUBST(OPENJDK_$1_CPU_ISADIR)
-
# Setup OPENJDK_$1_CPU_OSARCH, which is used to set the os.arch Java system property
OPENJDK_$1_CPU_OSARCH="$OPENJDK_$1_CPU"
if test "x$OPENJDK_$1_OS" = xlinux && test "x$OPENJDK_$1_CPU" = xx86; then
# On linux only, we replace x86 with i386.
OPENJDK_$1_CPU_OSARCH="i386"
--- 361,370 ----
*** 451,462 ****
AC_SUBST(HOTSPOT_$1_OS_TYPE)
HOTSPOT_$1_CPU=${OPENJDK_$1_CPU}
if test "x$OPENJDK_$1_CPU" = xx86; then
HOTSPOT_$1_CPU=x86_32
- elif test "x$OPENJDK_$1_CPU" = xsparcv9; then
- HOTSPOT_$1_CPU=sparc
elif test "x$OPENJDK_$1_CPU" = xppc64; then
HOTSPOT_$1_CPU=ppc_64
elif test "x$OPENJDK_$1_CPU" = xppc64le; then
HOTSPOT_$1_CPU=ppc_64
fi
--- 420,429 ----
*** 471,492 ****
HOTSPOT_$1_CPU_DEFINE=IA32
elif test "x$OPENJDK_$1_CPU" = xx86_64; then
HOTSPOT_$1_CPU_DEFINE=AMD64
elif test "x$OPENJDK_$1_CPU" = xx32; then
HOTSPOT_$1_CPU_DEFINE=X32
- elif test "x$OPENJDK_$1_CPU" = xsparcv9; then
- HOTSPOT_$1_CPU_DEFINE=SPARC
elif test "x$OPENJDK_$1_CPU" = xaarch64; then
HOTSPOT_$1_CPU_DEFINE=AARCH64
elif test "x$OPENJDK_$1_CPU" = xppc64; then
HOTSPOT_$1_CPU_DEFINE=PPC64
elif test "x$OPENJDK_$1_CPU" = xppc64le; then
HOTSPOT_$1_CPU_DEFINE=PPC64
# The cpu defines below are for zero, we don't support them directly.
- elif test "x$OPENJDK_$1_CPU" = xsparc; then
- HOTSPOT_$1_CPU_DEFINE=SPARC
elif test "x$OPENJDK_$1_CPU" = xppc; then
HOTSPOT_$1_CPU_DEFINE=PPC32
elif test "x$OPENJDK_$1_CPU" = xs390; then
HOTSPOT_$1_CPU_DEFINE=S390
elif test "x$OPENJDK_$1_CPU" = xs390x; then
--- 438,455 ----
*** 508,520 ****
AC_SUBST(OPENJDK_$1_OS_INCLUDE_SUBDIR)
])
AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
[
- if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
- RELEASE_FILE_OS_NAME=SunOS
- fi
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
RELEASE_FILE_OS_NAME=Linux
fi
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
RELEASE_FILE_OS_NAME=Windows
--- 471,480 ----
*** 564,592 ****
PLATFORM_EXTRACT_TARGET_AND_BUILD
PLATFORM_SETUP_TARGET_CPU_BITS
PLATFORM_SET_MODULE_TARGET_OS_VALUES
PLATFORM_SET_RELEASE_FILE_OS_VALUES
PLATFORM_SETUP_LEGACY_VARS
- PLATFORM_CHECK_DEPRECATION
- ])
! AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
! [
! UTIL_ARG_ENABLE(NAME: deprecated-ports, DEFAULT: false,
! RESULT: ENABLE_DEPRECATED_PORTS,
! DESC: [suppress the error when configuring for a deprecated port])
!
! if test "x$OPENJDK_TARGET_OS" = xsolaris || \
! (test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc && \
! test "x$with_jvm_variants" != xzero); then
! if test "x$ENABLE_DEPRECATED_PORTS" = "xtrue"; then
! AC_MSG_WARN([The Solaris and SPARC ports are deprecated and may be removed in a future release.])
! else
! AC_MSG_ERROR(m4_normalize([The Solaris and SPARC ports are deprecated and may be removed in a
! future release. Use --enable-deprecated-ports=yes to suppress this error.]))
! fi
! fi
])
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
[
###############################################################################
--- 524,536 ----
PLATFORM_EXTRACT_TARGET_AND_BUILD
PLATFORM_SETUP_TARGET_CPU_BITS
PLATFORM_SET_MODULE_TARGET_OS_VALUES
PLATFORM_SET_RELEASE_FILE_OS_VALUES
PLATFORM_SETUP_LEGACY_VARS
! # Deprecated in JDK 15
! UTIL_DEPRECATED_ARG_ENABLE(deprecated-ports)
])
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
[
###############################################################################
< prev index next >