common/autoconf/hotspot.m4

*** 304,445 ****
      if test "x$INVALID_FEATURES" != x; then
        AC_MSG_ERROR([Invalid JVM feature(s): $INVALID_FEATURES])
      fi
    done
  ])
- 
- ###############################################################################
- # Support for old hotspot build. Remove once new hotspot build has proven
- # to work satisfactory.
- #
- AC_DEFUN_ONCE([HOTSPOT_SETUP_LEGACY_BUILD],
- [
-   AC_ARG_ENABLE(new-hotspot-build, [AS_HELP_STRING([--disable-new-hotspot-build],
-       [disable the new hotspot build system (use the old) @<:@enabled@:>@])])
- 
-    if test "x$enable_new_hotspot_build" = "x" || test "x$enable_new_hotspot_build" = "xyes"; then
-      USE_NEW_HOTSPOT_BUILD=true
-    else
-      USE_NEW_HOTSPOT_BUILD=false
-    fi
-   AC_SUBST(USE_NEW_HOTSPOT_BUILD)
- 
-   case $HOTSPOT_DEBUG_LEVEL in
-     product )
-       VARIANT="OPT"
-       FASTDEBUG="false"
-       DEBUG_CLASSFILES="false"
-       ;;
-     fastdebug )
-       VARIANT="DBG"
-       FASTDEBUG="true"
-       DEBUG_CLASSFILES="true"
-       ;;
-     debug )
-       VARIANT="DBG"
-       FASTDEBUG="false"
-       DEBUG_CLASSFILES="true"
-       ;;
-     optimized )
-       VARIANT="OPT"
-       FASTDEBUG="false"
-       DEBUG_CLASSFILES="false"
-       ;;
-   esac
-   AC_SUBST(VARIANT)
-   AC_SUBST(FASTDEBUG)
-   AC_SUBST(DEBUG_CLASSFILES)
- 
-   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-     MACOSX_UNIVERSAL="true"
-   fi
- 
-   AC_SUBST(MACOSX_UNIVERSAL)
- 
-   # Make sure JVM_VARIANTS_COMMA use minimal1 for backwards compatibility
-   JVM_VARIANTS_COMMA=`$ECHO ,$JVM_VARIANTS_OPT, | $SED -e 's/,minimal,/,minimal1,/'`
- 
-   JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
-   JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
-   JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,minimal1\?,/!s/.*/false/g' -e '/,minimal1\?,/s/.*/true/g'`
-   JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
-   JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
-   JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
-   JVM_VARIANT_CUSTOM=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,custom,/!s/.*/false/g' -e '/,custom,/s/.*/true/g'`
- 
-   #####
-   # Generate the legacy makefile targets for hotspot.
-   HOTSPOT_TARGET=""
- 
-   if test "x$JVM_VARIANT_SERVER" = xtrue; then
-     HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
-   fi
- 
-   if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-     HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
-   fi
- 
-   if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
-     HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
-   fi
- 
-   if test "x$JVM_VARIANT_ZERO" = xtrue; then
-     HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
-   fi
- 
-   if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-     HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
-   fi
- 
-   if test "x$JVM_VARIANT_CORE" = xtrue; then
-     HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
-   fi
- 
-   HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_DEBUG_LEVEL"
- 
-   # On Macosx universal binaries are produced, but they only contain
-   # 64 bit intel. This invalidates control of which jvms are built
-   # from configure, but only server is valid anyway. Fix this
-   # when hotspot makefiles are rewritten.
-   if test "x$MACOSX_UNIVERSAL" = xtrue; then
-     HOTSPOT_TARGET=universal_${HOTSPOT_DEBUG_LEVEL}
-   fi
- 
-   HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
-   AC_SUBST(HOTSPOT_MAKE_ARGS)
- 
-   # Control wether Hotspot runs Queens test after build.
-   AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
-       [run the Queens test after Hotspot build @<:@disabled@:>@])],,
-       [enable_hotspot_test_in_build=no])
-   if test "x$enable_hotspot_test_in_build" = "xyes"; then
-     TEST_IN_BUILD=true
-   else
-     TEST_IN_BUILD=false
-   fi
-   AC_SUBST(TEST_IN_BUILD)
- 
-   if test "x$USE_NEW_HOTSPOT_BUILD" = xfalse; then
-     if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-       if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-         AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
-       fi
-     fi
-     if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
-       if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-         AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
-       fi
-     fi
-     if test "x$JVM_VARIANT_CUSTOM" = xtrue; then
-         AC_MSG_ERROR([You cannot build a custom JVM using the old hotspot build system.])
-     fi
-   fi
- 
-   AC_SUBST(JVM_VARIANTS_COMMA)
-   AC_SUBST(JVM_VARIANT_SERVER)
-   AC_SUBST(JVM_VARIANT_CLIENT)
-   AC_SUBST(JVM_VARIANT_MINIMAL1)
-   AC_SUBST(JVM_VARIANT_HOTSPOT)
-   AC_SUBST(JVM_VARIANT_ZERO)
-   AC_SUBST(JVM_VARIANT_ZEROSHARK)
-   AC_SUBST(JVM_VARIANT_CORE)
- ])
--- 304,308 ----