1.1 --- a/make/linux/makefiles/top.make Tue Nov 23 15:01:43 2010 -0500
1.2 +++ b/make/linux/makefiles/top.make Tue Nov 23 13:22:55 2010 -0800
1.3 @@ -31,7 +31,7 @@
1.4 # -generate sa-jdi.jar (JDI binding to core files)
1.5
1.6 # It assumes the following flags are set:
1.7 -# CFLAGS Platform_file, Src_Dirs, SYSDEFS, AOUT, Obj_Files
1.8 +# CFLAGS Platform_file, Src_Dirs_I, Src_Dirs_V, SYSDEFS, AOUT, Obj_Files
1.9
1.10 # -- D. Ungar (5/97) from a file by Bill Bush
1.11
1.12 @@ -45,10 +45,6 @@
1.13 Plat_File = $(Platform_file)
1.14 CDG = cd $(GENERATED);
1.15
1.16 -# Pick up MakeDeps' sources and definitions
1.17 -include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/makedeps.make
1.18 -MakeDepsClass = MakeDeps.class
1.19 -
1.20 ifdef USE_PRECOMPILED_HEADER
1.21 PrecompiledOption = -DUSE_PRECOMPILED_HEADER
1.22 UpdatePCH = $(MAKE) -f vm.make $(PRECOMPILED_HEADER) $(MFLAGS)
1.23 @@ -57,33 +53,7 @@
1.24 PrecompiledOption =
1.25 endif
1.26
1.27 -MakeDeps = $(RUN.JAVA) $(PrecompiledOption) -classpath $(GENERATED) MakeDeps
1.28 -
1.29 -Include_DBs/GC = $(VM)/includeDB_gc \
1.30 - $(VM)/includeDB_gc_parallel \
1.31 - $(VM)/gc_implementation/includeDB_gc_parallelScavenge \
1.32 - $(VM)/gc_implementation/includeDB_gc_concurrentMarkSweep \
1.33 - $(VM)/gc_implementation/includeDB_gc_parNew \
1.34 - $(VM)/gc_implementation/includeDB_gc_g1 \
1.35 - $(VM)/gc_implementation/includeDB_gc_serial \
1.36 - $(VM)/gc_implementation/includeDB_gc_shared
1.37 -
1.38 -Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC) \
1.39 - $(VM)/includeDB_jvmti \
1.40 - $(VM)/includeDB_features
1.41 -Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
1.42 -Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
1.43 -Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
1.44 -Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero
1.45 -Include_DBs/SHARK = $(Include_DBs/ZERO) $(VM)/includeDB_shark
1.46 -Include_DBs = $(Include_DBs/$(TYPE))
1.47 -
1.48 Cached_plat = $(GENERATED)/platform.current
1.49 -Cached_db = $(GENERATED)/includeDB.current
1.50 -
1.51 -Incremental_Lists = $(Cached_db)
1.52 -# list generation also creates $(GENERATED)/$(Cached_plat)
1.53 -
1.54
1.55 AD_Dir = $(GENERATED)/adfiles
1.56 ADLC = $(AD_Dir)/adlc
1.57 @@ -102,7 +72,7 @@
1.58 MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"`
1.59
1.60
1.61 -# default target: make makeDeps, update lists, make vm
1.62 +# default target: update lists, make vm
1.63 # done in stages to force sequential order with parallel make
1.64 #
1.65
1.66 @@ -110,39 +80,18 @@
1.67 @echo All done.
1.68
1.69 # This is an explicit dependency for the sake of parallel makes.
1.70 -vm_build_preliminaries: checks $(Incremental_Lists) $(AD_Files_If_Required) jvmti_stuff sa_stuff
1.71 +vm_build_preliminaries: checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff sa_stuff
1.72 @# We need a null action here, so implicit rules don't get consulted.
1.73
1.74 -# make makeDeps: (and zap the cached db files to force a nonincremental run)
1.75 -
1.76 -$(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
1.77 - @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
1.78 - @echo Removing $(Incremental_Lists) to force regeneration.
1.79 - @rm -f $(Incremental_Lists)
1.80 - @$(CDG) echo >$(Cached_plat)
1.81 -
1.82 -# make incremental_lists, if cached files out of date, run makeDeps
1.83 -
1.84 -$(Incremental_Lists): $(Include_DBs) $(Plat_File) $(GENERATED)/$(MakeDepsClass)
1.85 - $(CDG) cat $(Include_DBs) > $(GENERATED)/includeDB
1.86 - $(CDG) if [ ! -r incls ] ; then \
1.87 - mkdir incls ; \
1.88 - fi
1.89 - $(CDG) (echo $(CDG) echo $(MakeDeps) diffs UnixPlatform $(Cached_plat) $(Cached_db) $(Plat_File) $(GENERATED)/includeDB $(MakeDepsOptions)) > makeDeps.sh
1.90 - $(CDG) $(REMOTE) sh $(GENERATED)/makeDeps.sh
1.91 - $(CDG) cp includeDB $(Cached_db)
1.92 +$(Cached_plat): $(Plat_File)
1.93 $(CDG) cp $(Plat_File) $(Cached_plat)
1.94
1.95 -# symbolic target for command lines
1.96 -lists: $(Incremental_Lists)
1.97 - @: lists are now up to date
1.98 -
1.99 # make AD files as necessary
1.100 -ad_stuff: $(Incremental_Lists) $(adjust-mflags)
1.101 +ad_stuff: $(Cached_plat) $(adjust-mflags)
1.102 @$(MAKE) -f adlc.make $(MFLAGS-adjusted)
1.103
1.104 # generate JVMTI files from the spec
1.105 -jvmti_stuff: $(Incremental_Lists) $(adjust-mflags)
1.106 +jvmti_stuff: $(Cached_plat) $(adjust-mflags)
1.107 @$(MAKE) -f jvmti.make $(MFLAGS-adjusted)
1.108
1.109 # generate SA jar files and native header
1.110 @@ -169,7 +118,7 @@
1.111 install: the_vm
1.112 @$(MAKE) -f vm.make install
1.113
1.114 -# next rules support "make foo.[oi]"
1.115 +# next rules support "make foo.[ois]"
1.116
1.117 %.o %.i %.s:
1.118 $(UpdatePCH)
1.119 @@ -179,7 +128,6 @@
1.120 # this should force everything to be rebuilt
1.121 clean:
1.122 rm -f $(GENERATED)/*.class
1.123 - $(MAKE) $(MFLAGS) $(GENERATED)/$(MakeDepsClass)
1.124 $(MAKE) -f vm.make $(MFLAGS) clean
1.125
1.126 # just in case it doesn't, this should do it
