comparison make/solaris/Makefile @ 21559:be896a1983c0

recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 15:36:48 +0200
parents 7848fc12602b
children
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
147 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs 147 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
148 SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS)) 148 SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
149 SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS)) 149 SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
150 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS)) 150 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
151 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS)) 151 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
152 SUBDIRS_GRAAL = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS)) 152 SUBDIRS_JVMCI = $(addprefix $(OSNAME)_$(BUILDARCH)_jvmci/,$(TARGETS))
153 153
154 TARGETS_C2 = $(TARGETS) 154 TARGETS_C2 = $(TARGETS)
155 TARGETS_C1 = $(addsuffix 1,$(TARGETS)) 155 TARGETS_C1 = $(addsuffix 1,$(TARGETS))
156 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS)) 156 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
157 TARGETS_CORE = $(addsuffix core,$(TARGETS)) 157 TARGETS_CORE = $(addsuffix core,$(TARGETS))
158 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS)) 158 TARGETS_JVMCI = $(addsuffix jvmci,$(TARGETS))
159 159
160 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make 160 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
161 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) 161 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
162 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 162 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
163 BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE) 163 BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
171 all: 171 all:
172 @echo "Try '$(MAKE) <target> ...' where <target> is one or more of" 172 @echo "Try '$(MAKE) <target> ...' where <target> is one or more of"
173 @echo " $(TARGETS_C2)" 173 @echo " $(TARGETS_C2)"
174 @echo " $(TARGETS_C1)" 174 @echo " $(TARGETS_C1)"
175 @echo " $(TARGETS_CORE)" 175 @echo " $(TARGETS_CORE)"
176 @echo " $(TARGETS_GRAAL)" 176 @echo " $(TARGETS_JVMCI)"
177 177
178 checks: check_os_version check_j2se_version 178 checks: check_os_version check_j2se_version
179 179
180 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x, 180 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
181 # Solaris 2.5.1, 2.6). 181 # Solaris 2.5.1, 2.6).
221 221
222 $(SUBDIRS_CORE): $(BUILDTREE_MAKE) 222 $(SUBDIRS_CORE): $(BUILDTREE_MAKE)
223 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 223 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
224 $(BUILDTREE) VARIANT=core 224 $(BUILDTREE) VARIANT=core
225 225
226 $(SUBDIRS_GRAAL): $(BUILDTREE_MAKE) 226 $(SUBDIRS_JVMCI): $(BUILDTREE_MAKE)
227 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 227 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
228 $(BUILDTREE) VARIANT=graal 228 $(BUILDTREE) VARIANT=jvmci
229 229
230 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME 230 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
231 231
232 $(TARGETS_C2): $(SUBDIRS_C2) 232 $(TARGETS_C2): $(SUBDIRS_C2)
233 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) 233 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
251 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) 251 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
252 ifdef INSTALL 252 ifdef INSTALL
253 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 253 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
254 endif 254 endif
255 255
256 $(TARGETS_GRAAL): $(SUBDIRS_GRAAL) 256 $(TARGETS_JVMCI): $(SUBDIRS_JVMCI)
257 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) 257 cd $(OSNAME)_$(BUILDARCH)_jvmci/$(patsubst %jvmci,%,$@) && $(MAKE) $(MFLAGS)
258 ifdef INSTALL 258 ifdef INSTALL
259 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) install 259 cd $(OSNAME)_$(BUILDARCH)_jvmci/$(patsubst %jvmci,%,$@) && $(MAKE) $(MFLAGS) install
260 endif 260 endif
261 261
262 # Just build the tree, and nothing else: 262 # Just build the tree, and nothing else:
263 tree: $(SUBDIRS_C2) 263 tree: $(SUBDIRS_C2)
264 tree1: $(SUBDIRS_C1) 264 tree1: $(SUBDIRS_C1)
265 treecore: $(SUBDIRS_CORE) 265 treecore: $(SUBDIRS_CORE)
266 treegraal: $(SUBDIRS_GRAAL) 266 treejvmci: $(SUBDIRS_JVMCI)
267 267
268 # Doc target. This is the same for all build options. 268 # Doc target. This is the same for all build options.
269 # Hence create a docs directory beside ...$(ARCH)_[...] 269 # Hence create a docs directory beside ...$(ARCH)_[...]
270 # We specify 'BUILD_FLAVOR=product' so that the proper 270 # We specify 'BUILD_FLAVOR=product' so that the proper
271 # ENABLE_FULL_DEBUG_SYMBOLS value is used. 271 # ENABLE_FULL_DEBUG_SYMBOLS value is used.
291 jvmgcore: warn_jvmg_deprecated debugcore 291 jvmgcore: warn_jvmg_deprecated debugcore
292 292
293 clean_docs: 293 clean_docs:
294 rm -rf $(SUBDIR_DOCS) 294 rm -rf $(SUBDIR_DOCS)
295 295
296 clean_compiler1 clean_compiler2 clean_core clean_graal: 296 clean_compiler1 clean_compiler2 clean_core clean_jvmci:
297 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@) 297 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
298 298
299 clean: clean_compiler2 clean_compiler1 clean_core clean_docs clean_graal 299 clean: clean_compiler2 clean_compiler1 clean_core clean_docs clean_jvmci
300 300
301 include $(GAMMADIR)/make/cscope.make 301 include $(GAMMADIR)/make/cscope.make
302 302
303 #------------------------------------------------------------------------------- 303 #-------------------------------------------------------------------------------
304 304
305 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) 305 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE)
306 .PHONY: tree tree1 treecore treegraal 306 .PHONY: tree tree1 treecore treejvmci
307 .PHONY: all compiler1 compiler2 core graal 307 .PHONY: all compiler1 compiler2 core jvmci
308 .PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs clean_graal 308 .PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs clean_jvmci
309 .PHONY: checks check_os_version check_j2se_version 309 .PHONY: checks check_os_version check_j2se_version