common/autoconf/hotspot.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
*** 127,141 ****
    if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
      INCLUDE_SA=false
    fi
    AC_SUBST(INCLUDE_SA)
  
-   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-     MACOSX_UNIVERSAL="true"
-   fi
- 
-   AC_SUBST(MACOSX_UNIVERSAL)
  ])
  
  
  ###############################################################################
  # Setup legacy vars/targets and new vars to deal with different debug levels.
--- 127,136 ----
*** 228,243 ****
      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
    # 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}
    fi
  
    #####
  
    AC_SUBST(DEBUG_LEVEL)
--- 223,237 ----
      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
    fi
  
    HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
  
!   # 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$OPENJDK_TARGET_OS" = "xmacosx"; then
!     HOTSPOT_TARGET=macosx_${HOTSPOT_EXPORT}
    fi
  
    #####
  
    AC_SUBST(DEBUG_LEVEL)