make/autoconf/platform.m4

rev 59383 : [mq]: final

*** 160,169 ****
--- 160,181 ----
        VAR_CPU=sparcv9
        VAR_CPU_ARCH=sparc
        VAR_CPU_BITS=64
        VAR_CPU_ENDIAN=big
        ;;
+     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
  ])
*** 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*)
--- 188,197 ----
*** 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"
--- 387,396 ----
*** 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
--- 503,512 ----
*** 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],
  [
    ###############################################################################
--- 556,568 ----
    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],
  [
    ###############################################################################