*** old/common/autoconf/generated-configure.sh	Fri Jan 29 10:22:45 2016
--- new/common/autoconf/generated-configure.sh	Fri Jan 29 10:22:44 2016

*** 907,917 ****
--- 907,916 ----
  BUILD_VARIANT_RELEASE
  DEBUG_CLASSFILES
  FASTDEBUG
  VARIANT
  DEBUG_LEVEL
  MACOSX_UNIVERSAL
  INCLUDE_SA
  JVM_VARIANT_CORE
  JVM_VARIANT_ZEROSHARK
  JVM_VARIANT_ZERO
  JVM_VARIANT_MINIMAL1

*** 4837,4847 ****
--- 4836,4846 ----
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1452780299
! DATE_WHEN_GENERATED=1453564616
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #

*** 15837,15851 ****
--- 15836,15845 ----
    if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
      INCLUDE_SA=false
    fi
  
  
    if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
      MACOSX_UNIVERSAL="true"
    fi
  
  
  
  
    DEBUG_LEVEL="release"
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which debug level to use" >&5
  $as_echo_n "checking which debug level to use... " >&6; }

*** 15963,15978 ****
--- 15957,15971 ----
      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
    fi
  
    HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
  
    # On Macosx universal binaries are produced, but they only contain
    # 64 bit intel. This invalidates control of which jvms are built
+   # 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_EXPORT}
!   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
!     HOTSPOT_TARGET=macosx_${HOTSPOT_EXPORT}
    fi
  
    #####