# HG changeset patch # User erikj # Date 1409219944 -7200 # Node ID 32d2efad175db1e12c7d07273f229f2d988f339b # Parent 2caee34956f2fef45e4ca036594f81008d93b0b2 8056053: Disable HOTSPOT_BUILD_JOBS when building with configure Reviewed-by: dholmes, ihse, dcubed diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/Makefile --- a/hotspot/make/Makefile Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/Makefile Thu Aug 28 11:59:04 2014 +0200 @@ -890,3 +890,5 @@ create_jdk copy_jdk update_jdk test_jdk \ copy_product_jdk copy_fastdebug_jdk copy_debug_jdk \ $(HS_ALT_MAKE)/Makefile.make remove_old_debuginfo + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/aix/Makefile --- a/hotspot/make/aix/Makefile Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/aix/Makefile Thu Aug 28 11:59:04 2014 +0200 @@ -256,36 +256,36 @@ $(SUBDIRS_TIERED): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=tiered + +$(BUILDTREE) VARIANT=tiered $(SUBDIRS_C2): $(BUILDTREE_MAKE) ifeq ($(FORCE_TIERED),1) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 + +$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 else $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=compiler2 + +$(BUILDTREE) VARIANT=compiler2 endif $(SUBDIRS_C1): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=compiler1 + +$(BUILDTREE) VARIANT=compiler1 $(SUBDIRS_CORE): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=core + +$(BUILDTREE) VARIANT=core $(SUBDIRS_ZERO): $(BUILDTREE_MAKE) platform_zero $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH) + +$(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH) $(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) + +$(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) $(SUBDIRS_MINIMAL1): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=minimal1 + +$(BUILDTREE) VARIANT=minimal1 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in @@ -379,3 +379,5 @@ .PHONY: all compiler1 compiler2 core zero shark .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs .PHONY: checks check_os_version check_j2se_version + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/aix/makefiles/buildtree.make --- a/hotspot/make/aix/makefiles/buildtree.make Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/aix/makefiles/buildtree.make Thu Aug 28 11:59:04 2014 +0200 @@ -173,7 +173,7 @@ # Run make in each subdirectory recursively. $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE $(QUIETLY) [ -d $@ ] || { mkdir -p $@; } - $(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F) + +$(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F) $(QUIETLY) touch $@ $(SIMPLE_DIRS): @@ -364,3 +364,5 @@ FORCE: .PHONY: all FORCE + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/aix/makefiles/top.make --- a/hotspot/make/aix/makefiles/top.make Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/aix/makefiles/top.make Thu Aug 28 11:59:04 2014 +0200 @@ -69,7 +69,13 @@ # Wierd argument adjustment for "gnumake -j..." adjust-mflags = $(GENERATED)/adjust-mflags -MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` +# If SPEC is set, it's from configure and it's already controlling concurrency +# for us. Skip setting -j with HOTSPOT_BUILD_JOBS. +ifeq ($(SPEC), ) + MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` +else + MFLAGS-adjusted = -r $(MFLAGS) +endif # default target: update lists, make vm @@ -116,7 +122,7 @@ @+mv $@+ $@ the_vm: vm_build_preliminaries $(adjust-mflags) - @$(UpdatePCH) + +@$(UpdatePCH) @$(MAKE) -f vm.make $(MFLAGS-adjusted) install gamma: the_vm @@ -125,7 +131,7 @@ # next rules support "make foo.[ois]" %.o %.i %.s: - $(UpdatePCH) + +$(UpdatePCH) $(MAKE) -f vm.make $(MFLAGS) $@ #$(MAKE) -f vm.make $@ @@ -142,3 +148,5 @@ .PHONY: default vm_build_preliminaries .PHONY: lists ad_stuff jvmti_stuff sa_stuff the_vm clean realclean .PHONY: checks check_os_version install + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/bsd/Makefile --- a/hotspot/make/bsd/Makefile Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/bsd/Makefile Thu Aug 28 11:59:04 2014 +0200 @@ -250,36 +250,36 @@ $(SUBDIRS_TIERED): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=tiered + +$(BUILDTREE) VARIANT=tiered $(SUBDIRS_C2): $(BUILDTREE_MAKE) ifeq ($(FORCE_TIERED),1) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 + +$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 else $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=compiler2 + +$(BUILDTREE) VARIANT=compiler2 endif $(SUBDIRS_C1): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=compiler1 + +$(BUILDTREE) VARIANT=compiler1 $(SUBDIRS_CORE): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=core + +$(BUILDTREE) VARIANT=core $(SUBDIRS_ZERO): $(BUILDTREE_MAKE) platform_zero $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH) + +$(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH) $(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) + +$(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) $(SUBDIRS_MINIMAL1): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=minimal1 + +$(BUILDTREE) VARIANT=minimal1 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ @@ -392,3 +392,5 @@ .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs .PHONY: checks check_os_version check_j2se_version .PHONY: $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/bsd/makefiles/buildtree.make --- a/hotspot/make/bsd/makefiles/buildtree.make Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/bsd/makefiles/buildtree.make Thu Aug 28 11:59:04 2014 +0200 @@ -178,7 +178,7 @@ # Run make in each subdirectory recursively. $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE $(QUIETLY) [ -d $@ ] || { mkdir -p $@; } - $(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F) + +$(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F) $(QUIETLY) touch $@ $(SIMPLE_DIRS): @@ -378,3 +378,5 @@ FORCE: .PHONY: all FORCE + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/bsd/makefiles/top.make --- a/hotspot/make/bsd/makefiles/top.make Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/bsd/makefiles/top.make Thu Aug 28 11:59:04 2014 +0200 @@ -69,7 +69,13 @@ # Wierd argument adjustment for "gnumake -j..." adjust-mflags = $(GENERATED)/adjust-mflags -MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` +# If SPEC is set, it's from configure and it's already controlling concurrency +# for us. Skip setting -j with HOTSPOT_BUILD_JOBS. +ifeq ($(SPEC), ) + MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` +else + MFLAGS-adjusted = -r $(MFLAGS) +endif # default target: update lists, make vm @@ -125,7 +131,7 @@ @+mv $@+ $@ the_vm: vm_build_preliminaries $(adjust-mflags) - @$(UpdatePCH) + +@$(UpdatePCH) @$(MAKE) -f vm.make $(MFLAGS-adjusted) install : the_vm @@ -134,7 +140,7 @@ # next rules support "make foo.[ois]" %.o %.i %.s: - $(UpdatePCH) + +$(UpdatePCH) $(MAKE) -f vm.make $(MFLAGS) $@ #$(MAKE) -f vm.make $@ @@ -151,3 +157,5 @@ .PHONY: default vm_build_preliminaries .PHONY: lists ad_stuff jvmti_stuff sa_stuff the_vm clean realclean .PHONY: checks check_os_version install + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/linux/Makefile --- a/hotspot/make/linux/Makefile Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/linux/Makefile Thu Aug 28 11:59:04 2014 +0200 @@ -256,36 +256,36 @@ $(SUBDIRS_TIERED): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=tiered + +$(BUILDTREE) VARIANT=tiered $(SUBDIRS_C2): $(BUILDTREE_MAKE) ifeq ($(FORCE_TIERED),1) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 + +$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 else $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=compiler2 + +$(BUILDTREE) VARIANT=compiler2 endif $(SUBDIRS_C1): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=compiler1 + +$(BUILDTREE) VARIANT=compiler1 $(SUBDIRS_CORE): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=core + +$(BUILDTREE) VARIANT=core $(SUBDIRS_ZERO): $(BUILDTREE_MAKE) platform_zero $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH) + +$(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH) $(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) + +$(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) $(SUBDIRS_MINIMAL1): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=minimal1 + +$(BUILDTREE) VARIANT=minimal1 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in @@ -399,3 +399,5 @@ .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs .PHONY: checks check_os_version check_j2se_version .PHONY: $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/linux/makefiles/buildtree.make --- a/hotspot/make/linux/makefiles/buildtree.make Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/linux/makefiles/buildtree.make Thu Aug 28 11:59:04 2014 +0200 @@ -172,7 +172,7 @@ # Run make in each subdirectory recursively. $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE $(QUIETLY) [ -d $@ ] || { mkdir -p $@; } - $(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F) + +$(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F) $(QUIETLY) touch $@ $(SIMPLE_DIRS): @@ -377,3 +377,5 @@ FORCE: .PHONY: all FORCE + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/linux/makefiles/top.make --- a/hotspot/make/linux/makefiles/top.make Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/linux/makefiles/top.make Thu Aug 28 11:59:04 2014 +0200 @@ -69,7 +69,13 @@ # Wierd argument adjustment for "gnumake -j..." adjust-mflags = $(GENERATED)/adjust-mflags -MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` +# If SPEC is set, it's from configure and it's already controlling concurrency +# for us. Skip setting -j with HOTSPOT_BUILD_JOBS. +ifeq ($(SPEC), ) + MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` +else + MFLAGS-adjusted = -r $(MFLAGS) +endif # default target: update lists, make vm @@ -119,7 +125,7 @@ @+mv $@+ $@ the_vm: vm_build_preliminaries $(adjust-mflags) - @$(UpdatePCH) + +@$(UpdatePCH) @$(MAKE) -f vm.make $(MFLAGS-adjusted) install: the_vm @@ -128,7 +134,7 @@ # next rules support "make foo.[ois]" %.o %.i %.s: - $(UpdatePCH) + +$(UpdatePCH) $(MAKE) -f vm.make $(MFLAGS) $@ #$(MAKE) -f vm.make $@ @@ -145,3 +151,5 @@ .PHONY: default vm_build_preliminaries .PHONY: lists ad_stuff jvmti_stuff sa_stuff the_vm clean realclean .PHONY: checks check_os_version install + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/solaris/Makefile --- a/hotspot/make/solaris/Makefile Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/solaris/Makefile Thu Aug 28 11:59:04 2014 +0200 @@ -200,24 +200,24 @@ $(SUBDIRS_TIERED): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=tiered + +$(BUILDTREE) VARIANT=tiered $(SUBDIRS_C2): $(BUILDTREE_MAKE) ifeq ($(FORCE_TIERED),1) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 + +$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 else $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=compiler2 + +$(BUILDTREE) VARIANT=compiler2 endif $(SUBDIRS_C1): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=compiler1 + +$(BUILDTREE) VARIANT=compiler1 $(SUBDIRS_CORE): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=core + +$(BUILDTREE) VARIANT=core # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME @@ -292,3 +292,5 @@ .PHONY: all compiler1 compiler2 core .PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs .PHONY: checks check_os_version check_j2se_version + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/solaris/makefiles/buildtree.make --- a/hotspot/make/solaris/makefiles/buildtree.make Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/solaris/makefiles/buildtree.make Thu Aug 28 11:59:04 2014 +0200 @@ -165,7 +165,7 @@ # Run make in each subdirectory recursively. $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE $(QUIETLY) [ -d $@ ] || { mkdir -p $@; } - $(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F) + +$(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F) $(QUIETLY) touch $@ $(SIMPLE_DIRS): @@ -364,3 +364,5 @@ FORCE: .PHONY: all FORCE + +.NOTPARALLEL: diff -r 2caee34956f2 -r 32d2efad175d hotspot/make/solaris/makefiles/top.make --- a/hotspot/make/solaris/makefiles/top.make Fri Sep 05 15:53:02 2014 -0700 +++ b/hotspot/make/solaris/makefiles/top.make Thu Aug 28 11:59:04 2014 +0200 @@ -62,7 +62,13 @@ # Wierd argument adjustment for "gnumake -j..." adjust-mflags = $(GENERATED)/adjust-mflags -MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` +# If SPEC is set, it's from configure and it's already controlling concurrency +# for us. Skip setting -j with HOTSPOT_BUILD_JOBS. +ifeq ($(SPEC), ) + MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` +else + MFLAGS-adjusted = -r $(MFLAGS) +endif # default target: update lists, make vm @@ -136,3 +142,5 @@ .PHONY: default vm_build_preliminaries .PHONY: lists ad_stuff jvmti_stuff trace_stuff sa_stuff the_vm clean realclean .PHONY: checks check_os_version install + +.NOTPARALLEL: