Changeset 2621 for trunk/kBuild/tools/VCC100AMD64.kmk

Timestamp:

Aug 2, 2012, 6:14:25 AM (13 years ago)

Author:

bird

Message:

VCC100*.kmk: kObjCache changes. No PDB files when the cache is used, and optimize the preprocessor output to increase the hit rate (and reduce dispace requirements quite significantly).

File:

• trunk/kBuild/tools/VCC100AMD64.kmk (modified) (2 diffs)

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -136 +136 @@
 TOOL_VCC100AMD64_COMPILE_C_DEPEND =
 TOOL_VCC100AMD64_COMPILE_C_DEPORD =
-TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
 ifdef KBUILD_USE_KOBJCACHE
 TOOL_VCC100AMD64_COMPILE_C_USES_KOBJCACHE = 1
-TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) $(outbase).i
+TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(outbase).i
+TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE =
 define TOOL_VCC100AMD64_COMPILE_C_CMDS
-        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
+        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
+                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
                 --kObjCache-cpp $(outbase).i\
                 $(TOOL_VCC100AMD64_CC) -E\
-                $(flags)\
+                $(subst -Zi,-Z7,$(flags))\
                 $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(subst /,\\,$(abspath $(source))) \
                 --kObjCache-cc $(obj)\
                 $(TOOL_VCC100AMD64_CC) -c\
-                $(flags)\
-                -Fd$(outbase)-obj.pdb \
-                -FD\
+                $(subst -Zi,-Z7,$(flags))\
                 -Fo$(obj)\
                 $(outbase).i
-        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
 endef
 else  # !KBUILD_USE_KOBJCACHE
 TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
+TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
 define TOOL_VCC100AMD64_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VCC100AMD64_CC) -c\
@@ -185 +184 @@
 TOOL_VCC100AMD64_COMPILE_CXX_DEPEND =
 TOOL_VCC100AMD64_COMPILE_CXX_DEPORD =
-TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
 ifdef KBUILD_USE_KOBJCACHE
 TOOL_VCC100AMD64_COMPILE_CXX_USES_KOBJCACHE = 1
-TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) $(outbase).ii
+TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(outbase).ii
+TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE =
 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
+        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
+                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
                 --kObjCache-cpp $(outbase).ii\
                 $(TOOL_VCC100AMD64_CXX) -E\
-                $(flags)\
+                $(subst -Zi,-Z7,$(flags))\
                 $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(subst /,\\,$(abspath $(source))) \
                 --kObjCache-cc $(obj)\
                 $(TOOL_VCC100AMD64_CXX) -c\
-                $(flags)\
-                -Fd$(outbase)-obj.pdb \
-                -FD\
+                $(subst -Zi,-Z7,$(flags))\
                 -Fo$(obj)\
                 $(outbase).ii
-        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
 endef
 else  # !KBUILD_USE_KOBJCACHE
 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
+TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VCC100AMD64_CXX) -c\