make/aix/makefiles/vm.make

Print this page
rev 6314 : 8030011: Update Hotspot version string output
Reviewed-by: dholmes, jcoomes, kvn


  56 Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
  57 VPATH += $(Src_Dirs_V:%=%:)
  58 
  59 # set INCLUDES for C preprocessor.
  60 Src_Dirs_I += $(GENERATED)
  61 # The order is important for the precompiled headers to work.
  62 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
  63 
  64 # SYMFLAG is used by {jsig,saproc}.make
  65 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
  66   # always build with debug info when we can create .debuginfo files
  67   SYMFLAG = -g
  68 else
  69   ifeq (${VERSION}, debug)
  70     SYMFLAG = -g
  71   else
  72     SYMFLAG =
  73   endif
  74 endif
  75 
  76 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
  77 # in $(GAMMADIR)/make/defs.make
  78 ifeq ($(HOTSPOT_BUILD_VERSION),)
  79   BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)\""
  80 else
  81   BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)\""
  82 endif
  83 
  84 # The following variables are defined in the generated flags.make file.
  85 BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\""
  86 JRE_VERSION   = -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""





  87 HS_LIB_ARCH   = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
  88 BUILD_TARGET  = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
  89 BUILD_USER    = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
  90 VM_DISTRO     = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
  91 
  92 CXXFLAGS =           \
  93   ${SYSDEFS}         \
  94   ${INCLUDES}        \
  95   ${BUILD_VERSION}   \
  96   ${BUILD_TARGET}    \
  97   ${BUILD_USER}      \
  98   ${HS_LIB_ARCH}     \
  99   ${VM_DISTRO}
 100 
 101 # This is VERY important! The version define must only be supplied to vm_version.o
 102 # If not, ccache will not re-use the cache at all, since the version string might contain
 103 # a time and date.
 104 CXXFLAGS/vm_version.o += ${JRE_VERSION}
 105 
 106 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
 107 
 108 # File specific flags
 109 CXXFLAGS += $(CXXFLAGS/BYFILE)
 110 
 111 
 112 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 113 CFLAGS += $(CFLAGS_WARN/BYFILE)
 114 
 115 # Do not use C++ exception handling
 116 CFLAGS += $(CFLAGS/NOEX)
 117 
 118 # Extra flags from gnumake's invocation or environment
 119 CFLAGS += $(EXTRA_CFLAGS)
 120 LFLAGS += $(EXTRA_CFLAGS)
 121 
 122 # Don't set excutable bit on stack segment
 123 # the same could be done by separate execstack command
 124 #LFLAGS += -Xlinker -z -Xlinker noexecstack




  56 Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
  57 VPATH += $(Src_Dirs_V:%=%:)
  58 
  59 # set INCLUDES for C preprocessor.
  60 Src_Dirs_I += $(GENERATED)
  61 # The order is important for the precompiled headers to work.
  62 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
  63 
  64 # SYMFLAG is used by {jsig,saproc}.make
  65 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
  66   # always build with debug info when we can create .debuginfo files
  67   SYMFLAG = -g
  68 else
  69   ifeq (${VERSION}, debug)
  70     SYMFLAG = -g
  71   else
  72     SYMFLAG =
  73   endif
  74 endif
  75 








  76 # The following variables are defined in the generated flags.make file.
  77 JDK_VER_DEFS  = -DJDK_MAJOR_VERSION="\"$(JDK_MAJOR_VERSION)\"" \
  78                 -DJDK_MINOR_VERSION="\"$(JDK_MINOR_VERSION)\"" \
  79                 -DJDK_MICRO_VERSION="\"$(JDK_MICRO_VERSION)\"" \
  80                 -DJDK_BUILD_NUMBER="\"$(JDK_BUILD_NUMBER)\""
  81 VM_VER_DEFS   = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" \
  82                 -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""  \
  83                 $(JDK_VER_DEFS)
  84 HS_LIB_ARCH   = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
  85 BUILD_TARGET  = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
  86 BUILD_USER    = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
  87 VM_DISTRO     = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
  88 
  89 CXXFLAGS =           \
  90   ${SYSDEFS}         \
  91   ${INCLUDES}        \

  92   ${BUILD_TARGET}    \
  93   ${BUILD_USER}      \
  94   ${HS_LIB_ARCH}     \
  95   ${VM_DISTRO}
  96 
  97 # This is VERY important! The version define must only be supplied to vm_version.o
  98 # If not, ccache will not re-use the cache at all, since the version string might contain
  99 # a time and date.
 100 CXXFLAGS/vm_version.o += ${VM_VER_DEFS}
 101 
 102 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
 103 
 104 # File specific flags
 105 CXXFLAGS += $(CXXFLAGS/BYFILE)
 106 
 107 
 108 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 109 CFLAGS += $(CFLAGS_WARN/BYFILE)
 110 
 111 # Do not use C++ exception handling
 112 CFLAGS += $(CFLAGS/NOEX)
 113 
 114 # Extra flags from gnumake's invocation or environment
 115 CFLAGS += $(EXTRA_CFLAGS)
 116 LFLAGS += $(EXTRA_CFLAGS)
 117 
 118 # Don't set excutable bit on stack segment
 119 # the same could be done by separate execstack command
 120 #LFLAGS += -Xlinker -z -Xlinker noexecstack