Print this page 
rev 6314 : 8030011: Update Hotspot version string output
Reviewed-by: dholmes, jcoomes, kvn
Split Split Close
Expand all
Collapse all
          --- old/make/solaris/makefiles/vm.make
          +++ new/make/solaris/makefiles/vm.make
↓ open down ↓ 61 lines elided ↑ open up ↑ 
  62   62    SYMFLAG = -g -xs
  63   63  else
  64   64    ifeq (${VERSION}, debug)
  65   65      SYMFLAG = -g
  66   66    else
  67   67      SYMFLAG =
  68   68    endif
  69   69  endif
  70   70  
  71   71  # The following variables are defined in the generated flags.make file.
  72      -BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\""
  73      -JRE_VERSION   = -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""
       72 +JDK_VER_DEFS  = -DJDK_MAJOR_VERSION="\"$(JDK_MAJOR_VERSION)\"" \
       73 +                -DJDK_MINOR_VERSION="\"$(JDK_MINOR_VERSION)\"" \
       74 +                -DJDK_MICRO_VERSION="\"$(JDK_MICRO_VERSION)\"" \
       75 +                -DJDK_BUILD_NUMBER="\"$(JDK_BUILD_NUMBER)\""
       76 +VM_VER_DEFS   = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" \
       77 +                -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""  \
       78 +                $(JDK_VER_DEFS)
  74   79  HS_LIB_ARCH   = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
  75   80  BUILD_TARGET  = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
  76   81  BUILD_USER    = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
  77   82  VM_DISTRO     = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
  78   83  
  79   84  CXXFLAGS =           \
  80   85    ${SYSDEFS}         \
  81   86    ${INCLUDES}        \
  82      -  ${BUILD_VERSION}   \
  83   87    ${BUILD_TARGET}    \
  84   88    ${BUILD_USER}      \
  85   89    ${HS_LIB_ARCH}     \
  86   90    ${VM_DISTRO}
  87   91  
  88   92  # This is VERY important! The version define must only be supplied to vm_version.o
  89   93  # If not, ccache will not re-use the cache at all, since the version string might contain
  90   94  # a time and date.
  91      -CXXFLAGS/vm_version.o += ${JRE_VERSION}
       95 +CXXFLAGS/vm_version.o += ${VM_VER_DEFS}
  92   96  
  93   97  CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
  94   98  
  95   99  # File specific flags
  96  100  CXXFLAGS += $(CXXFLAGS/BYFILE)
  97  101  
  98  102  # Large File Support
  99  103  ifneq ($(LP64), 1)
 100  104  CXXFLAGS/ostream.o += -D_FILE_OFFSET_BITS=64
 101  105  endif # ifneq ($(LP64), 1)
↓ open down ↓ 256 lines elided ↑ open up ↑ 
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX