VirtualBox

Changeset 2621 in kBuild


Ignore:
Timestamp:
Aug 2, 2012 4:14:25 AM (12 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).

Location:
trunk/kBuild/tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC100.kmk

    r2611 r2621  
    155155TOOL_VCC100_COMPILE_C_DEPEND =
    156156TOOL_VCC100_COMPILE_C_DEPORD =
    157 TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
    158157ifdef KBUILD_USE_KOBJCACHE
    159158TOOL_VCC100_COMPILE_C_USES_KOBJCACHE = 1
    160 TOOL_VCC100_COMPILE_C_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb) $(outbase).i
     159TOOL_VCC100_COMPILE_C_OUTPUT = $(outbase).i
     160TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE =
    161161define TOOL_VCC100_COMPILE_C_CMDS
    162         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
     162        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
     163                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    163164                --kObjCache-cpp $(outbase).i\
    164165                $(TOOL_VCC100_CC) -E\
    165                 $(flags)\
     166                $(subst -Zi,-Z7,$(flags))\
    166167                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    167168                $(subst /,\\,$(abspath $(source))) \
    168169                --kObjCache-cc $(obj)\
    169                 $(TOOL_VCC100_C) -c\
    170                 $(flags)\
    171                 -Fd$(outbase)-obj.pdb \
    172                 -FD\
     170                $(TOOL_VCC100_CC) -c\
     171                $(subst -Zi,-Z7,$(flags))\
    173172                -Fo$(obj)\
    174173                $(outbase).i
    175         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
    176174endef
    177175else  # !KBUILD_USE_KOBJCACHE
    178176TOOL_VCC100_COMPILE_C_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
     177TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
    179178define TOOL_VCC100_COMPILE_C_CMDS
    180179        $(QUIET)$(TOOL_VCC100_CC) -c\
    … …  
    204203TOOL_VCC100_COMPILE_CXX_DEPEND =
    205204TOOL_VCC100_COMPILE_CXX_DEPORD =
    206 TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
    207205ifdef KBUILD_USE_KOBJCACHE
    208206TOOL_VCC100_COMPILE_CXX_USES_KOBJCACHE = 1
    209 TOOL_VCC100_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb) $(outbase).ii
     207TOOL_VCC100_COMPILE_CXX_OUTPUT = $(outbase).ii
     208TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE =
    210209define TOOL_VCC100_COMPILE_CXX_CMDS
    211         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
     210        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
     211                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    212212                --kObjCache-cpp $(outbase).ii\
    213213                $(TOOL_VCC100_CXX) -E\
    214                 $(flags)\
     214                $(subst -Zi,-Z7,$(flags))\
    215215                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    216216                $(subst /,\\,$(abspath $(source))) \
    217217                --kObjCache-cc $(obj)\
    218218                $(TOOL_VCC100_CXX) -c\
    219                 $(flags)\
    220                 -Fd$(outbase)-obj.pdb \
    221                 -FD\
     219                $(subst -Zi,-Z7,$(flags))\
    222220                -Fo$(obj)\
    223221                $(outbase).ii
    224         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
    225222endef
    226223else  # !KBUILD_USE_KOBJCACHE
    227224TOOL_VCC100_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
     225TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
    228226define TOOL_VCC100_COMPILE_CXX_CMDS
    229227        $(QUIET)$(TOOL_VCC100_CXX) -c\

  • trunk/kBuild/tools/VCC100AMD64.kmk

    r2611 r2621  
    136136TOOL_VCC100AMD64_COMPILE_C_DEPEND =
    137137TOOL_VCC100AMD64_COMPILE_C_DEPORD =
    138 TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
    139138ifdef KBUILD_USE_KOBJCACHE
    140139TOOL_VCC100AMD64_COMPILE_C_USES_KOBJCACHE = 1
    141 TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) $(outbase).i
     140TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(outbase).i
     141TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE =
    142142define TOOL_VCC100AMD64_COMPILE_C_CMDS
    143         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
     143        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
     144                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    144145                --kObjCache-cpp $(outbase).i\
    145146                $(TOOL_VCC100AMD64_CC) -E\
    146                 $(flags)\
     147                $(subst -Zi,-Z7,$(flags))\
    147148                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    148149                $(subst /,\\,$(abspath $(source))) \
    149150                --kObjCache-cc $(obj)\
    150151                $(TOOL_VCC100AMD64_CC) -c\
    151                 $(flags)\
    152                 -Fd$(outbase)-obj.pdb \
    153                 -FD\
     152                $(subst -Zi,-Z7,$(flags))\
    154153                -Fo$(obj)\
    155154                $(outbase).i
    156         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    157155endef
    158156else  # !KBUILD_USE_KOBJCACHE
    159157TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
     158TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
    160159define TOOL_VCC100AMD64_COMPILE_C_CMDS
    161160        $(QUIET)$(TOOL_VCC100AMD64_CC) -c\
    … …  
    185184TOOL_VCC100AMD64_COMPILE_CXX_DEPEND =
    186185TOOL_VCC100AMD64_COMPILE_CXX_DEPORD =
    187 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
    188186ifdef KBUILD_USE_KOBJCACHE
    189187TOOL_VCC100AMD64_COMPILE_CXX_USES_KOBJCACHE = 1
    190 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) $(outbase).ii
     188TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(outbase).ii
     189TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE =
    191190define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
    192         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
     191        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
     192                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    193193                --kObjCache-cpp $(outbase).ii\
    194194                $(TOOL_VCC100AMD64_CXX) -E\
    195                 $(flags)\
     195                $(subst -Zi,-Z7,$(flags))\
    196196                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    197197                $(subst /,\\,$(abspath $(source))) \
    198198                --kObjCache-cc $(obj)\
    199199                $(TOOL_VCC100AMD64_CXX) -c\
    200                 $(flags)\
    201                 -Fd$(outbase)-obj.pdb \
    202                 -FD\
     200                $(subst -Zi,-Z7,$(flags))\
    203201                -Fo$(obj)\
    204202                $(outbase).ii
    205         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    206203endef
    207204else  # !KBUILD_USE_KOBJCACHE
    208205TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
     206TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
    209207define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
    210208        $(QUIET)$(TOOL_VCC100AMD64_CXX) -c\

  • trunk/kBuild/tools/VCC100X86.kmk

    r2611 r2621  
    137137TOOL_VCC100X86_COMPILE_C_DEPEND =
    138138TOOL_VCC100X86_COMPILE_C_DEPORD =
    139 TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
    140139ifdef KBUILD_USE_KOBJCACHE
    141140TOOL_VCC100X86_COMPILE_C_USES_KOBJCACHE = 1
    142 TOOL_VCC100X86_COMPILE_C_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb) $(outbase).i
     141TOOL_VCC100X86_COMPILE_C_OUTPUT = $(outbase).i
     142TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE =
    143143define TOOL_VCC100X86_COMPILE_C_CMDS
    144         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
     144        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
     145                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    145146                --kObjCache-cpp $(outbase).i\
    146147                $(TOOL_VCC100X86_CC) -E\
    147                 $(flags)\
     148                $(subst -Zi,-Z7,$(flags))\
    148149                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    149150                $(subst /,\\,$(abspath $(source))) \
    150151                --kObjCache-cc $(obj)\
    151152                $(TOOL_VCC100X86_CC) -c\
    152                 $(flags)\
    153                 -Fd$(outbase)-obj.pdb \
    154                 -FD\
     153                $(subst -Zi,-Z7,$(flags))\
    155154                -Fo$(obj)\
    156155                $(outbase).i
    157         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
    158156endef
    159157else  # !KBUILD_USE_KOBJCACHE
    160158TOOL_VCC100X86_COMPILE_C_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
     159TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
    161160define TOOL_VCC100X86_COMPILE_C_CMDS
    162161        $(QUIET)$(TOOL_VCC100X86_CC) -c\
    … …  
    186185TOOL_VCC100X86_COMPILE_CXX_DEPEND =
    187186TOOL_VCC100X86_COMPILE_CXX_DEPORD =
    188 TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
    189187ifdef KBUILD_USE_KOBJCACHE
    190188TOOL_VCC100X86_COMPILE_CXX_USES_KOBJCACHE = 1
    191 TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb) $(outbase).ii
     189TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(outbase).ii
     190TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE =
    192191define TOOL_VCC100X86_COMPILE_CXX_CMDS
    193         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
     192        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
     193                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    194194                --kObjCache-cpp $(outbase).ii\
    195195                $(TOOL_VCC100X86_CXX) -E\
    196                 $(flags)\
     196                $(subst -Zi,-Z7,$(flags))\
    197197                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    198198                $(subst /,\\,$(abspath $(source))) \
    199199                --kObjCache-cc $(obj)\
    200200                $(TOOL_VCC100X86_CXX) -c\
    201                 $(flags)\
    202                 -Fd$(outbase)-obj.pdb \
    203                 -FD\
     201                $(subst -Zi,-Z7,$(flags))\
    204202                -Fo$(obj)\
    205203                $(outbase).ii
    206         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
    207204endef
    208205else  # !KBUILD_USE_KOBJCACHE
    209206TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
     207TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
    210208define TOOL_VCC100X86_COMPILE_CXX_CMDS
    211209        $(QUIET)$(TOOL_VCC100X86_CXX) -c\
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette