97 ifeq ($(JVM_VARIANTS),)
98 ifeq ($(ZERO_BUILD), true)
99 ifeq ($(SHARK_BUILD), true)
100 JVM_VARIANTS:=zeroshark
101 JVM_VARIANT_ZEROSHARK:=true
102 else
103 JVM_VARIANTS:=zero
104 JVM_VARIANT_ZERO:=true
105 endif
106 else
107 # A default is needed
108 ifeq ($(BUILD_CLIENT_ONLY), true)
109 JVM_VARIANTS:=client
110 JVM_VARIANT_CLIENT:=true
111 endif
112 # Further defaults are platform and arch specific
113 endif
114 endif
115
116 # hotspot version definitions
117 include $(GAMMADIR)/make/hotspot_version
118
119 # Java versions needed
120 ifeq ($(PREVIOUS_JDK_VERSION),)
121 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)
122 endif
123 ifeq ($(JDK_MAJOR_VERSION),)
124 JDK_MAJOR_VERSION=$(JDK_MAJOR_VER)
125 endif
126 ifeq ($(JDK_MINOR_VERSION),)
127 JDK_MINOR_VERSION=$(JDK_MINOR_VER)
128 endif
129 ifeq ($(JDK_MICRO_VERSION),)
130 JDK_MICRO_VERSION=$(JDK_MICRO_VER)
131 endif
132 ifeq ($(JDK_MKTG_VERSION),)
133 JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
134 endif
135 ifeq ($(JDK_VERSION),)
136 JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
137 endif
138 ifeq ($(FULL_VERSION),)
139 FULL_VERSION="$(JDK_VERSION)"
140 endif
141
142 # FULL_VERSION is only used to define JRE_RELEASE_VERSION which is used
143 # as JRE version in VM -Xinternalversion output.
144 ifndef JRE_RELEASE_VERSION
145 JRE_RELEASE_VERSION=$(FULL_VERSION)
146 endif
147
148 ifndef HOTSPOT_RELEASE_VERSION
149 HOTSPOT_RELEASE_VERSION=$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)
150 endif
151
152 ifdef HOTSPOT_BUILD_VERSION
153 # specified in command line
154 else
155 ifdef COOKED_BUILD_NUMBER
156 # JRE build
157 HOTSPOT_BUILD_VERSION=
158 else
159 ifdef USER_RELEASE_SUFFIX
160 HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX)
161 else
162 HOTSPOT_BUILD_VERSION=internal
163 endif
164 endif
165 endif
166
167 # Windows should have OS predefined
168 ifeq ($(OS),)
169 OS := $(shell uname -s)
308 # LIBARCH is 1:1 mapping from BUILDARCH
309 LIBARCH = $(LIBARCH/$(BUILDARCH))
310 LIBARCH/i486 = i386
311 LIBARCH/amd64 = amd64
312 LIBARCH/sparc = sparc
313 LIBARCH/sparcv9 = sparcv9
314 LIBARCH/ia64 = ia64
315 LIBARCH/ppc64 = ppc64
316 LIBARCH/ppc = ppc
317 LIBARCH/arm = arm
318 LIBARCH/zero = $(ZERO_LIBARCH)
319
320 LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero
321 endif
322
323 # Required make macro settings for all platforms
324 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR)
325 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)
326 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR)
327 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE)
328 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION)
329 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
330
331 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile
332 # to overwrite the default definition since OS specific Makefile also
333 # includes this make/defs.make file.
334 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION)
335
336 # Various export sub directories
337 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include
338 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs
339 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib
340 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre
341 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin
342 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib
343 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
344
345 # non-universal macosx builds need to appear universal
346 ifeq ($(OS_VENDOR), Darwin)
347 ifneq ($(MACOSX_UNIVERSAL), true)
348 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)
|
97 ifeq ($(JVM_VARIANTS),)
98 ifeq ($(ZERO_BUILD), true)
99 ifeq ($(SHARK_BUILD), true)
100 JVM_VARIANTS:=zeroshark
101 JVM_VARIANT_ZEROSHARK:=true
102 else
103 JVM_VARIANTS:=zero
104 JVM_VARIANT_ZERO:=true
105 endif
106 else
107 # A default is needed
108 ifeq ($(BUILD_CLIENT_ONLY), true)
109 JVM_VARIANTS:=client
110 JVM_VARIANT_CLIENT:=true
111 endif
112 # Further defaults are platform and arch specific
113 endif
114 endif
115
116 # hotspot version definitions
117 include $(GAMMADIR)/make/jdk_version
118
119 # Java versions needed
120 ifeq ($(PREVIOUS_JDK_VERSION),)
121 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)
122 endif
123 ifeq ($(JDK_MAJOR_VERSION),)
124 JDK_MAJOR_VERSION=$(JDK_MAJOR_VER)
125 endif
126 ifeq ($(JDK_MINOR_VERSION),)
127 JDK_MINOR_VERSION=$(JDK_MINOR_VER)
128 endif
129 ifeq ($(JDK_MICRO_VERSION),)
130 JDK_MICRO_VERSION=$(JDK_MICRO_VER)
131 endif
132 ifeq ($(JDK_BUILD_NUMBER),)
133 JDK_BUILD_NUMBER=0
134 endif
135 ifeq ($(JDK_MKTG_VERSION),)
136 JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
137 endif
138 ifeq ($(JDK_VERSION),)
139 JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
140 endif
141 ifeq ($(FULL_VERSION),)
142 FULL_VERSION="$(JDK_VERSION)"
143 endif
144
145 # FULL_VERSION is only used to define JRE_RELEASE_VERSION which is used
146 # as JRE version in VM -Xinternalversion output.
147 ifndef JRE_RELEASE_VERSION
148 JRE_RELEASE_VERSION=$(FULL_VERSION)
149 endif
150
151 ifndef HOTSPOT_RELEASE_VERSION
152 HOTSPOT_RELEASE_VERSION=$(FULL_VERSION)
153 endif
154
155 ifdef HOTSPOT_BUILD_VERSION
156 # specified in command line
157 else
158 ifdef COOKED_BUILD_NUMBER
159 # JRE build
160 HOTSPOT_BUILD_VERSION=
161 else
162 ifdef USER_RELEASE_SUFFIX
163 HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX)
164 else
165 HOTSPOT_BUILD_VERSION=internal
166 endif
167 endif
168 endif
169
170 # Windows should have OS predefined
171 ifeq ($(OS),)
172 OS := $(shell uname -s)
311 # LIBARCH is 1:1 mapping from BUILDARCH
312 LIBARCH = $(LIBARCH/$(BUILDARCH))
313 LIBARCH/i486 = i386
314 LIBARCH/amd64 = amd64
315 LIBARCH/sparc = sparc
316 LIBARCH/sparcv9 = sparcv9
317 LIBARCH/ia64 = ia64
318 LIBARCH/ppc64 = ppc64
319 LIBARCH/ppc = ppc
320 LIBARCH/arm = arm
321 LIBARCH/zero = $(ZERO_LIBARCH)
322
323 LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero
324 endif
325
326 # Required make macro settings for all platforms
327 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR)
328 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)
329 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR)
330 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE)
331 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
332
333 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile
334 # to overwrite the default definition since OS specific Makefile also
335 # includes this make/defs.make file.
336 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION)
337
338 # Various export sub directories
339 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include
340 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs
341 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib
342 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre
343 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin
344 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib
345 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
346
347 # non-universal macosx builds need to appear universal
348 ifeq ($(OS_VENDOR), Darwin)
349 ifneq ($(MACOSX_UNIVERSAL), true)
350 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)
|