hotspot/make/solaris/makefiles/defs.make

*** 1,7 ****
  #
! # Copyright (c) 2006, 2014, 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.
--- 1,7 ----
  #
! # Copyright (c) 2006, 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.
*** 75,126 ****
      JVM_VARIANTS:=server
      JVM_VARIANT_SERVER:=true
    endif
  endif
  
! # determine if HotSpot is being built in JDK6 or earlier version
! JDK6_OR_EARLIER=0
! ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
!   # if the longer variable names (newer build style) are set, then check those
!   ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1"
!     JDK6_OR_EARLIER=1
!   endif
! else
!   # the longer variables aren't set so check the shorter variable names
!   ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1"
!     JDK6_OR_EARLIER=1
!   endif
! endif
! 
! ifeq ($(JDK6_OR_EARLIER),0)
!   # Full Debug Symbols is supported on JDK7 or newer.
!   # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product
!   # builds is enabled with debug info files ZIP'ed to save space. For
!   # BUILD_FLAVOR != product builds, FDS is always enabled, after all a
!   # debug build without debug info isn't very useful.
!   # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
!   #
!   # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
!   # disabled for a BUILD_FLAVOR == product build.
!   #
!   # Note: Use of a different variable name for the FDS override option
!   # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
!   # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
!   # in options via environment variables, use of distinct variables
!   # prevents strange behaviours. For example, in a BUILD_FLAVOR !=
!   # product build, the FULL_DEBUG_SYMBOLS environment variable will be
!   # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If
!   # the same variable name is used, then different values can be picked
!   # up by different parts of the build. Just to be clear, we only need
!   # two variable names because the incoming option value can be
!   # overridden in some situations, e.g., a BUILD_FLAVOR != product
!   # build.
! 
!   # Due to the multiple sub-make processes that occur this logic gets
!   # executed multiple times. We reduce the noise by at least checking that
!   # BUILD_FLAVOR has been set.
!   ifneq ($(BUILD_FLAVOR),)
      ifeq ($(BUILD_FLAVOR), product)
        FULL_DEBUG_SYMBOLS ?= 1
        ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
      else
        # debug variants always get Full Debug Symbols (if available)
--- 75,110 ----
      JVM_VARIANTS:=server
      JVM_VARIANT_SERVER:=true
    endif
  endif
  
! # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product
! # builds is enabled with debug info files ZIP'ed to save space. For
! # BUILD_FLAVOR != product builds, FDS is always enabled, after all a
! # debug build without debug info isn't very useful.
! # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
! #
! # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
! # disabled for a BUILD_FLAVOR == product build.
! #
! # Note: Use of a different variable name for the FDS override option
! # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
! # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
! # in options via environment variables, use of distinct variables
! # prevents strange behaviours. For example, in a BUILD_FLAVOR !=
! # product build, the FULL_DEBUG_SYMBOLS environment variable will be
! # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If
! # the same variable name is used, then different values can be picked
! # up by different parts of the build. Just to be clear, we only need
! # two variable names because the incoming option value can be
! # overridden in some situations, e.g., a BUILD_FLAVOR != product
! # build.
! 
! # Due to the multiple sub-make processes that occur this logic gets
! # executed multiple times. We reduce the noise by at least checking that
! # BUILD_FLAVOR has been set.
! ifneq ($(BUILD_FLAVOR),)
    ifeq ($(BUILD_FLAVOR), product)
      FULL_DEBUG_SYMBOLS ?= 1
      ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
    else
      # debug variants always get Full Debug Symbols (if available)
*** 211,222 ****
          ZIP_DEBUGINFO_FILES ?= 1
  
          $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
        endif
      endif # ENABLE_FULL_DEBUG_SYMBOLS=1
!   endif # BUILD_FLAVOR
! endif # JDK_6_OR_EARLIER
  
  JDK_INCLUDE_SUBDIR=solaris
  
  # Library suffix
  LIBRARY_SUFFIX=so
--- 195,205 ----
        ZIP_DEBUGINFO_FILES ?= 1
  
        $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
      endif
    endif # ENABLE_FULL_DEBUG_SYMBOLS=1
! endif # BUILD_FLAVOR
  
  JDK_INCLUDE_SUBDIR=solaris
  
  # Library suffix
  LIBRARY_SUFFIX=so