hotspot Sdiff make/solaris/makefiles

make/solaris/makefiles/defs.make

  42     PLATFORM=solaris-sparcv9
  43     VM_PLATFORM=solaris_sparcv9
  44   else
  45     PLATFORM=solaris-sparc
  46     VM_PLATFORM=solaris_sparc
  47   endif
  48   HS_ARCH=sparc
  49 else
  50   ifeq ($(ARCH_DATA_MODEL), 64)
  51     MAKE_ARGS += LP64=1
  52     PLATFORM=solaris-amd64
  53     VM_PLATFORM=solaris_amd64
  54     HS_ARCH=x86
  55   else
  56     PLATFORM=solaris-i586
  57     VM_PLATFORM=solaris_i486
  58     HS_ARCH=x86
  59   endif
  60 endif
  61 












  62 # determine if HotSpot is being built in JDK6 or earlier version
  63 JDK6_OR_EARLIER=0
  64 ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
  65   # if the longer variable names (newer build style) are set, then check those
  66   ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1"
  67     JDK6_OR_EARLIER=1
  68   endif
  69 else
  70   # the longer variables aren't set so check the shorter variable names
  71   ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1"
  72     JDK6_OR_EARLIER=1
  73   endif
  74 endif
  75 
  76 ifeq ($(JDK6_OR_EARLIER),0)
  77   # Full Debug Symbols is supported on JDK7 or newer
  78 
  79 ifdef ENABLE_FULL_DEBUG_SYMBOLS
  80   # Only check for Full Debug Symbols support on Solaris if it is
  81   # specifically enabled. Hopefully, it can be enabled by default

 136 
 137 # Library suffix
 138 LIBRARY_SUFFIX=so
 139 
 140 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
 141 VM_DEBUG=jvmg
 142 
 143 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
 144 
 145 # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
 146 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
 147 ifneq ($(OBJCOPY),)
 148   EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
 149 endif
 150 
 151 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
 152 
 153 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
 154 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
 155 
 156 ifneq ($(BUILD_CLIENT_ONLY),true)
 157 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
 158 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
 159 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
 160 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)




 161   ifneq ($(OBJCOPY),)
 162     EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
 163     EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo
 164     EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo
 165   endif
 166 endif
 167 ifeq ($(ARCH_DATA_MODEL), 32)
 168   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
 169   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 
 170   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 
 171   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)

 172   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
 173   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)

 174   ifneq ($(OBJCOPY),)
 175     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
 176     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo
 177     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo

 178     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo
 179     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo
 180   endif
 181   ifneq ($(BUILD_CLIENT_ONLY), true)
 182     EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
 183     EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
 184     ifneq ($(OBJCOPY),)
 185       EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo
 186       EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo
 187     endif
 188   endif
 189 endif
 190 
 191 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
 192 ifneq ($(OBJCOPY),)
 193   EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
 194 endif
 195 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar

  42     PLATFORM=solaris-sparcv9
  43     VM_PLATFORM=solaris_sparcv9
  44   else
  45     PLATFORM=solaris-sparc
  46     VM_PLATFORM=solaris_sparc
  47   endif
  48   HS_ARCH=sparc
  49 else
  50   ifeq ($(ARCH_DATA_MODEL), 64)
  51     MAKE_ARGS += LP64=1
  52     PLATFORM=solaris-amd64
  53     VM_PLATFORM=solaris_amd64
  54     HS_ARCH=x86
  55   else
  56     PLATFORM=solaris-i586
  57     VM_PLATFORM=solaris_i486
  58     HS_ARCH=x86
  59   endif
  60 endif
  61 
  62 # On 32 bit solaris we build server and client, on 64 bit just server.
  63 ifeq ($(JVM_VARIANTS),)
  64   ifeq ($(ARCH_DATA_MODEL), 32)
  65     JVM_VARIANTS:=client,server
  66     JVM_VARIANT_CLIENT:=true
  67     JVM_VARIANT_SERVER:=true
  68   else
  69     JVM_VARIANTS:=server
  70     JVM_VARIANT_SERVER:=true
  71   endif
  72 endif
  73 
  74 # determine if HotSpot is being built in JDK6 or earlier version
  75 JDK6_OR_EARLIER=0
  76 ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
  77   # if the longer variable names (newer build style) are set, then check those
  78   ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1"
  79     JDK6_OR_EARLIER=1
  80   endif
  81 else
  82   # the longer variables aren't set so check the shorter variable names
  83   ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1"
  84     JDK6_OR_EARLIER=1
  85   endif
  86 endif
  87 
  88 ifeq ($(JDK6_OR_EARLIER),0)
  89   # Full Debug Symbols is supported on JDK7 or newer
  90 
  91 ifdef ENABLE_FULL_DEBUG_SYMBOLS
  92   # Only check for Full Debug Symbols support on Solaris if it is
  93   # specifically enabled. Hopefully, it can be enabled by default

 148 
 149 # Library suffix
 150 LIBRARY_SUFFIX=so
 151 
 152 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
 153 VM_DEBUG=jvmg
 154 
 155 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
 156 
 157 # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
 158 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
 159 ifneq ($(OBJCOPY),)
 160   EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
 161 endif
 162 
 163 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
 164 
 165 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
 166 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
 167 
 168 ifeq ($(JVM_VARIANT_SERVER),true)
 169   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
 170   EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
 171   EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
 172   EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
 173   ifeq ($(ARCH_DATA_MODEL),32)
 174     EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
 175     EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
 176   endif
 177   ifneq ($(OBJCOPY),)
 178     EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
 179     EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo
 180     EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo
 181   endif
 182 endif
 183 ifeq ($(JVM_VARIANT_CLIENT),true)
 184   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
 185   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 
 186   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 
 187   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
 188   ifeq ($(ARCH_DATA_MODEL),32)
 189     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
 190     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
 191   endif
 192   ifneq ($(OBJCOPY),)
 193     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
 194     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo
 195     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo
 196     ifeq ($(ARCH_DATA_MODEL),32)
 197       EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo
 198       EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo







 199     endif
 200   endif
 201 endif
 202 
 203 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
 204 ifneq ($(OBJCOPY),)
 205   EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
 206 endif
 207 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar