common/autoconf/jdk-options.m4

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 64,74 ****
          ENABLE_DEBUG="${enableval}"
          DEBUG_LEVEL="fastdebug"
        ], [ENABLE_DEBUG="no"])
  
    AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
!       [set the debug level (release, fastdebug, slowdebug, optimized (HotSpot build only)) @<:@release@:>@])],
        [
          DEBUG_LEVEL="${withval}"
          if test "x$ENABLE_DEBUG" = xyes; then
            AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
          fi
--- 64,74 ----
          ENABLE_DEBUG="${enableval}"
          DEBUG_LEVEL="fastdebug"
        ], [ENABLE_DEBUG="no"])
  
    AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
!       [set the debug level (release, fastdebug, slowdebug, optimized) @<:@release@:>@])],
        [
          DEBUG_LEVEL="${withval}"
          if test "x$ENABLE_DEBUG" = xyes; then
            AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
          fi
*** 77,87 ****
  
    if test "x$DEBUG_LEVEL" != xrelease && \
        test "x$DEBUG_LEVEL" != xoptimized && \
        test "x$DEBUG_LEVEL" != xfastdebug && \
        test "x$DEBUG_LEVEL" != xslowdebug; then
!     AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
    fi
  ])
  
  ###############################################################################
  #
--- 77,87 ----
  
    if test "x$DEBUG_LEVEL" != xrelease && \
        test "x$DEBUG_LEVEL" != xoptimized && \
        test "x$DEBUG_LEVEL" != xfastdebug && \
        test "x$DEBUG_LEVEL" != xslowdebug; then
!     AC_MSG_ERROR([Allowed debug levels are: release, fastdebug, slowdebug and optimized])
    fi
  ])
  
  ###############################################################################
  #
*** 174,183 ****
--- 174,199 ----
    else
      UNLIMITED_CRYPTO=false
    fi
    AC_SUBST(UNLIMITED_CRYPTO)
  
+   # Should we build the serviceability agent (SA)?
+   INCLUDE_SA=true
+   if test "x$JVM_VARIANT_ZERO" = xtrue ; then
+     INCLUDE_SA=false
+   fi
+   if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
+     INCLUDE_SA=false
+   fi
+   if test "x$OPENJDK_TARGET_OS" = xaix ; then
+     INCLUDE_SA=false
+   fi
+   if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
+     INCLUDE_SA=false
+   fi
+   AC_SUBST(INCLUDE_SA)
+ 
    # Compress jars
    COMPRESS_JARS=false
  
    AC_SUBST(COMPRESS_JARS)
  
*** 220,230 ****
    # This must be done after the toolchain is setup, since we're looking at objcopy.
    #
    AC_MSG_CHECKING([what type of native debug symbols to use])
    AC_ARG_WITH([native-debug-symbols],
        [AS_HELP_STRING([--with-native-debug-symbols],
!       [set the native debug symbol configuration (none, internal, external, zipped) @<:@zipped@:>@])],
        [
          if test "x$OPENJDK_TARGET_OS" = xaix; then
            if test "x$withval" = xexternal || test "x$withval" = xzipped; then
              AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
            fi
--- 236,246 ----
    # This must be done after the toolchain is setup, since we're looking at objcopy.
    #
    AC_MSG_CHECKING([what type of native debug symbols to use])
    AC_ARG_WITH([native-debug-symbols],
        [AS_HELP_STRING([--with-native-debug-symbols],
!       [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
        [
          if test "x$OPENJDK_TARGET_OS" = xaix; then
            if test "x$withval" = xexternal || test "x$withval" = xzipped; then
              AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
            fi
*** 233,244 ****
--- 249,264 ----
        [
          if test "x$OPENJDK_TARGET_OS" = xaix; then
            # AIX doesn't support 'zipped' so use 'internal' as default
            with_native_debug_symbols="internal"
          else
+           if test "x$STATIC_BUILD" = xtrue; then
+             with_native_debug_symbols="none"
+           else
              with_native_debug_symbols="zipped"
            fi
+         fi
        ])
    NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
    AC_MSG_RESULT([$NATIVE_DEBUG_SYMBOLS])
  
    if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then