Changeset 3257 in kBuild

Timestamp:

Jan 3, 2019 2:46:05 AM (6 years ago)

Author:

bird

Message:

GXX,GXX3: PCH updates

Location:

trunk/kBuild/tools

Files:

• GXX.kmk (modified) (6 diffs)
• GXX3.kmk (modified) (2 diffs)

trunk/kBuild/tools/GXX.kmk

@@ -37 +37 @@
 TOOL_GXX_CC  ?= gcc$(HOSTSUFF_EXE)
 TOOL_GXX_CXX ?= g++$(HOSTSUFF_EXE)
+TOOL_GXX_PCH ?= $(TOOL_GXX_CXX)
 TOOL_GXX_AS  ?= gcc$(HOSTSUFF_EXE)
 TOOL_GXX_AR  ?= ar$(HOSTSUFF_EXE)
@@ -67 +68 @@
 TOOL_GXX_CXXDEFS          ?=
 
+TOOL_GXX_PCHOBJSUFF       ?= .h.gch
+TOOL_GXX_PCHFLAGS         ?= $(TOOL_GXX_CXXFLAGS)
+TOOL_GXX_PCHFLAGS.debug   ?= $(TOOL_GXX_CXXFLAGS.debug)
+TOOL_GXX_PCHFLAGS.profile ?= $(TOOL_GXX_CXXFLAGS.profile)
+TOOL_GXX_PCHFLAGS.release ?= $(TOOL_GXX_CXXFLAGS.release)
+TOOL_GXX_PCHINCS          ?= $(TOOL_GXX_CXXINCS)
+TOOL_GXX_PCHDEFS          ?= $(TOOL_GXX_CXXDEFS)
+
 TOOL_GXX_ASFLAGS          ?= -x assembler-with-cpp
 TOOL_GXX_ASFLAGS.debug    ?= -g
@@ -110 +119 @@
 # @param    $(source)   Source filename (relative).
 # @param    $(obj)      Object file name. This shall be (re)created by the compilation.
-# @param    $(dep)          Dependcy file. This shall be (re)created by the compilation.
-# @param    $(flags)    Flags.
-# @param    $(defs)     Definitions. No -D or something.
-# @param    $(incs)     Includes. No -I or something.
-# @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)             Other dependencies.
+# @param    $(dep)      Dependcy file. This shall be (re)created by the compilation.
+# @param    $(flags)    Flags.
+# @param    $(defs)     Definitions. No -D or something.
+# @param    $(incs)     Includes. No -I or something.
+# @param    $(dirdep)   Directory creation dependency.
+# @param    $(deps)     Other dependencies.
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
 TOOL_GXX_COMPILE_CXX_OUTPUT =
-TOOL_GXX_COMPILE_CXX_DEPEND =
+TOOL_GXX_COMPILE_CXX_DEPEND = $($(target)_1_GCC_PCH_FILE)
 TOOL_GXX_COMPILE_CXX_DEPORD =
 define TOOL_GXX_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_GXX_CXX) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+                $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+                -o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+                ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
+                $(abspath $(source))
+        $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
+endef
+
+
+## Precompile C++ header.
+# @param    $(target)   Normalized main target name.
+# @param    $(source)   Source filename (relative).
+# @param    $(obj)      Object file name. This shall be (re)created by the compilation.
+# @param    $(dep)          Dependcy file. This shall be (re)created by the compilation.
+# @param    $(flags)    Flags.
+# @param    $(defs)     Definitions. No -D or something.
+# @param    $(incs)     Includes. No -I or something.
+# @param    $(dirdep)   Directory creation dependency.
+# @param    $(deps)             Other dependencies.
+# @param    $(outbase)  Output basename (full). Use this for list files and such.
+# @param    $(objsuff)  Object suffix.
+TOOL_GXX_COMPILE_PCH_OUTPUT = $($(target)_1_GCC_PCH_FILE)
+TOOL_GXX_COMPILE_PCH_DEPEND =
+TOOL_GXX_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
+define TOOL_GXX_COMPILE_PCH_CMDS
+        $(QUIET)$(TOOL_GXX_PCH) -c\
+                $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
                 -o $(obj)\
                 $(abspath $(source))
+        $(INSTALL) --hard-link-files-when-possible -m 0644 -- "$(obj)" "$($(target)_1_GCC_PCH_FILE)"
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
@@ -171 +207 @@
 TOOL_GXX_LINK_LIBRARY_DEPORD =
 define TOOL_GXX_LINK_LIBRARY_CMDS
-        $(QUIET)$(TOOL_GXX_AR) $(flags) $(out) $(objs)
-        $(call xargs,$(QUIET)$(TOOL_GXX_AR) $(flags) $(out),$(objs))
+        $(QUIET)$(TOOL_GXX_AR) $(flags) $(out) $(filter-out %.h.gch,$(objs))
+        $(call xargs,$(QUIET)$(TOOL_GXX_AR) $(flags) $(out),$(filter-out %.h.gch,$(objs)))
         $(foreach lib,$(othersrc)\
                 ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \
@@ -204 +240 @@
 TOOL_GXX_LINK_PROGRAM_DEPORD =
 define TOOL_GXX_LINK_PROGRAM_CMDS
-        $(QUIET)$(TOOL_GXX_LD) $(flags) -o $(out) $(objs) \
+        $(QUIET)$(TOOL_GXX_LD) $(flags) -o $(out) $(filter-out %.h.gch,$(objs)) \
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
 endef
@@ -226 +262 @@
 TOOL_GXX_LINK_DLL_DEPORD =
 define TOOL_GXX_LINK_DLL_CMDS
-        $(QUIET)$(TOOL_GXX_LD) $(TOOL_GXX_LDFLAGS.dll) $(flags) -o $(out) $(objs) \
+        $(QUIET)$(TOOL_GXX_LD) $(TOOL_GXX_LDFLAGS.dll) $(flags) -o $(out) $(filter-out %.h.gch,$(objs)) \
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
 endef

trunk/kBuild/tools/GXX3.kmk

@@ -168 +168 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
+TOOL_GXX3_COMPILE_CXX_OUTPUT         = $(if-expr "$(use_objcache)" != "",$(outbase).ii,)
 TOOL_GXX3_COMPILE_CXX_DEPEND         = $($(target)_1_GCC_PCH_FILE)
 TOOL_GXX3_COMPILE_CXX_DEPORD         =
-TOOL_GXX3_COMPILE_CXX_OUTPUT         = $(if-expr "$(use_objcache)" != "",$(outbase).ii,)
 TOOL_GXX3_COMPILE_CXX_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
 define TOOL_GXX3_COMPILE_CXX_CMDS
@@ -210 +210 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
+TOOL_GXX3_COMPILE_PCH_OUTPUT = $($(target)_1_GCC_PCH_FILE)
+TOOL_GXX3_COMPILE_PCH_DEPEND =
 TOOL_GXX3_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
-TOOL_GXX3_COMPILE_PCH_DEPEND =
-TOOL_GXX3_COMPILE_PCH_OUTPUT = $($(target)_1_GCC_PCH_FILE)
 define TOOL_GXX3_COMPILE_PCH_CMDS
         $(QUIET)$(TOOL_GXX3_PCH) -c\