common/autoconf/jdk-options.m4

rev 994 : 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile

*** 174,183 ****
--- 174,184 ----
  [
    ###############################################################################
    #
    # Set the debug level
    #    release: no debug information, all optimizations, no asserts.
+   #    optimized: no debug information, all optimizations, no asserts, not product.
    #    fastdebug: debug information (-g), all optimizations, all asserts
    #    slowdebug: debug information (-g), no optimizations, all asserts
    #
    DEBUG_LEVEL="release"
    AC_MSG_CHECKING([which debug level to use])
*** 187,206 ****
          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) @<:@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
        ])
    AC_MSG_RESULT([$DEBUG_LEVEL])
  
    if test "x$DEBUG_LEVEL" != xrelease && \
        test "x$DEBUG_LEVEL" != xfastdebug && \
        test "x$DEBUG_LEVEL" != xslowdebug; then
      AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
    fi
  
--- 188,208 ----
          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 (i.e. not-product)) @<:@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
        ])
    AC_MSG_RESULT([$DEBUG_LEVEL])
  
    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
  
*** 233,242 ****
--- 235,252 ----
        DEBUG_CLASSFILES="true"
        BUILD_VARIANT_RELEASE="-debug"
        HOTSPOT_DEBUG_LEVEL="jvmg"
        HOTSPOT_EXPORT="debug"
        ;;
+     optimized )
+       VARIANT="OPT"
+       FASTDEBUG="false"
+       DEBUG_CLASSFILES="false"
+       BUILD_VARIANT_RELEASE="-optimized"
+       HOTSPOT_DEBUG_LEVEL="optimized"
+       HOTSPOT_EXPORT="optimized"
+       ;;
    esac
  
    #####
    # Generate the legacy makefile targets for hotspot.
    # The hotspot api for selecting the build artifacts, really, needs to be improved.