comparison make/linux/Makefile @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 297543799769 fb19af007ffc
children 989155e2d07a
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
173 # jvmgshark shark <os>_<arch>_shark/jvmg 173 # jvmgshark shark <os>_<arch>_shark/jvmg
174 # optimizedshark shark <os>_<arch>_shark/optimized 174 # optimizedshark shark <os>_<arch>_shark/optimized
175 # profiledshark shark <os>_<arch>_shark/profiled 175 # profiledshark shark <os>_<arch>_shark/profiled
176 # productshark shark <os>_<arch>_shark/product 176 # productshark shark <os>_<arch>_shark/product
177 # 177 #
178 # fastdebugminimal1 minimal1 <os>_<arch>_minimal1/fastdebug
179 # jvmgminimal1 minimal1 <os>_<arch>_minimal1/jvmg
180 # productminimal1 minimal1 <os>_<arch>_minimal1/product
181 #
178 # What you get with each target: 182 # What you get with each target:
179 # 183 #
180 # debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher 184 # debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher
181 # fastdebug* - optimized compile, but with asserts enabled 185 # fastdebug* - optimized compile, but with asserts enabled
182 # jvmg* - "fat" libjvm_g - debug info linked into libjvm_g.so 186 # jvmg* - "fat" libjvm_g - debug info linked into libjvm_g.so
197 SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS)) 201 SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
198 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS)) 202 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
199 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS)) 203 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
200 SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS)) 204 SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
201 SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS)) 205 SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
206 SUBDIRS_MINIMAL1 = $(addprefix $(OSNAME)_$(BUILDARCH)_minimal1/,$(TARGETS))
202 SUBDIRS_GRAAL = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS)) 207 SUBDIRS_GRAAL = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS))
203 208
204 TARGETS_C2 = $(TARGETS) 209 TARGETS_C2 = $(TARGETS)
205 TARGETS_C1 = $(addsuffix 1,$(TARGETS)) 210 TARGETS_C1 = $(addsuffix 1,$(TARGETS))
206 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS)) 211 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
207 TARGETS_CORE = $(addsuffix core,$(TARGETS)) 212 TARGETS_CORE = $(addsuffix core,$(TARGETS))
208 TARGETS_ZERO = $(addsuffix zero,$(TARGETS)) 213 TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
209 TARGETS_SHARK = $(addsuffix shark,$(TARGETS)) 214 TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
215 TARGETS_MINIMAL1 = $(addsuffix minimal1,$(TARGETS))
210 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS)) 216 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS))
211 217
212 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make 218 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
213 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) 219 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
214 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 220 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
224 @echo " $(TARGETS_C2)" 230 @echo " $(TARGETS_C2)"
225 @echo " $(TARGETS_C1)" 231 @echo " $(TARGETS_C1)"
226 @echo " $(TARGETS_CORE)" 232 @echo " $(TARGETS_CORE)"
227 @echo " $(TARGETS_ZERO)" 233 @echo " $(TARGETS_ZERO)"
228 @echo " $(TARGETS_SHARK)" 234 @echo " $(TARGETS_SHARK)"
235 @echo " $(TARGETS_MINIMAL1)"
229 @echo " $(TARGETS_GRAAL)" 236 @echo " $(TARGETS_GRAAL)"
230 237
231 checks: check_os_version check_j2se_version 238 checks: check_os_version check_j2se_version
232 239
233 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x, 240 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
282 289
283 $(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero 290 $(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
284 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 291 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
285 $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) 292 $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
286 293
294 $(SUBDIRS_MINIMAL1): $(BUILDTREE_MAKE)
295 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
296 $(BUILDTREE) VARIANT=minimal1
297
287 $(SUBDIRS_GRAAL): $(BUILDTREE_MAKE) 298 $(SUBDIRS_GRAAL): $(BUILDTREE_MAKE)
288 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 299 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
289 $(BUILDTREE) VARIANT=graal 300 $(BUILDTREE) VARIANT=graal
290 301
291 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in 302 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
293 304
294 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME 305 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
295 306
296 $(TARGETS_C2): $(SUBDIRS_C2) 307 $(TARGETS_C2): $(SUBDIRS_C2)
297 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) 308 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
309 ifeq ($(TEST_IN_BUILD),true)
298 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma 310 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
311 endif
299 ifdef INSTALL 312 ifdef INSTALL
300 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install 313 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
301 endif 314 endif
302 315
303 $(TARGETS_TIERED): $(SUBDIRS_TIERED) 316 $(TARGETS_TIERED): $(SUBDIRS_TIERED)
304 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) 317 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
318 ifeq ($(TEST_IN_BUILD),true)
305 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma 319 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
320 endif
306 ifdef INSTALL 321 ifdef INSTALL
307 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install 322 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
308 endif 323 endif
309 324
310 $(TARGETS_C1): $(SUBDIRS_C1) 325 $(TARGETS_C1): $(SUBDIRS_C1)
311 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) 326 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
327 ifeq ($(TEST_IN_BUILD),true)
312 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma 328 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
329 endif
313 ifdef INSTALL 330 ifdef INSTALL
314 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install 331 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
315 endif 332 endif
316 333
317 $(TARGETS_CORE): $(SUBDIRS_CORE) 334 $(TARGETS_CORE): $(SUBDIRS_CORE)
318 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) 335 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
336 ifeq ($(TEST_IN_BUILD),true)
319 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma 337 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
338 endif
320 ifdef INSTALL 339 ifdef INSTALL
321 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 340 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
322 endif 341 endif
323 342
324 $(TARGETS_ZERO): $(SUBDIRS_ZERO) 343 $(TARGETS_ZERO): $(SUBDIRS_ZERO)
325 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) 344 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
345 ifeq ($(TEST_IN_BUILD),true)
326 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma 346 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
347 endif
327 ifdef INSTALL 348 ifdef INSTALL
328 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install 349 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
329 endif 350 endif
330 351
331 $(TARGETS_SHARK): $(SUBDIRS_SHARK) 352 $(TARGETS_SHARK): $(SUBDIRS_SHARK)
332 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) 353 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
354 ifeq ($(TEST_IN_BUILD),true)
333 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma 355 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
356 endif
334 ifdef INSTALL 357 ifdef INSTALL
335 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install 358 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
359 endif
360
361 $(TARGETS_MINIMAL1): $(SUBDIRS_MINIMAL1)
362 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS)
363 ifeq ($(TEST_IN_BUILD),true)
364 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && ./test_gamma
365 endif
366 ifdef INSTALL
367 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install
336 endif 368 endif
337 369
338 $(TARGETS_GRAAL): $(SUBDIRS_GRAAL) 370 $(TARGETS_GRAAL): $(SUBDIRS_GRAAL)
339 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) 371 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS)
340 ifdef INSTALL 372 ifdef INSTALL
345 tree: $(SUBDIRS_C2) 377 tree: $(SUBDIRS_C2)
346 tree1: $(SUBDIRS_C1) 378 tree1: $(SUBDIRS_C1)
347 treecore: $(SUBDIRS_CORE) 379 treecore: $(SUBDIRS_CORE)
348 treezero: $(SUBDIRS_ZERO) 380 treezero: $(SUBDIRS_ZERO)
349 treeshark: $(SUBDIRS_SHARK) 381 treeshark: $(SUBDIRS_SHARK)
382 treeminimal1: $(SUBDIRS_MINIMAL1)
350 treegraal: $(SUBDIRS_GRAAL) 383 treegraal: $(SUBDIRS_GRAAL)
351 384
352 # Doc target. This is the same for all build options. 385 # Doc target. This is the same for all build options.
353 # Hence create a docs directory beside ...$(ARCH)_[...] 386 # Hence create a docs directory beside ...$(ARCH)_[...]
354 # We specify 'BUILD_FLAVOR=product' so that the proper 387 # We specify 'BUILD_FLAVOR=product' so that the proper
369 shark: jvmgshark productshark 402 shark: jvmgshark productshark
370 403
371 clean_docs: 404 clean_docs:
372 rm -rf $(SUBDIR_DOCS) 405 rm -rf $(SUBDIR_DOCS)
373 406
374 clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_graal: 407 clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_graal clean_minimal1:
375 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@) 408 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
376 409
377 clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_docs clean_graal 410 clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_minimal1 clean_graal clean_docs
378 411
379 include $(GAMMADIR)/make/cscope.make 412 include $(GAMMADIR)/make/cscope.make
380 413
414 #
415 # Include alternate Makefile if it exists.
416 #
417 -include $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make
418
381 #------------------------------------------------------------------------------- 419 #-------------------------------------------------------------------------------
382 420
383 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_GRAAL) 421 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_MINIMAL1) $(TARGETS_GRAAL)
384 .PHONY: tree tree1 treecore treezero treeshark treegraal 422 .PHONY: tree tree1 treecore treezero treeshark treegraal
385 .PHONY: all compiler1 compiler2 core zero shark graal 423 .PHONY: all compiler1 compiler2 core zero shark graal
386 .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs clean_graal 424 .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs clean_graal
387 .PHONY: checks check_os_version check_j2se_version 425 .PHONY: checks check_os_version check_j2se_version
426 .PHONY: $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make