Changeset 3250 for trunk/kBuild/tools/GXX3.kmk

Timestamp:

Dec 28, 2018, 11:43:52 PM (6 years ago)

Author:

bird

Message:

Working on precompiled headers for GCC.

File:

• trunk/kBuild/tools/GXX3.kmk (modified) (6 diffs)

trunk/kBuild/tools/GXX3.kmk ¶

@@ -37 +37 @@
 TOOL_GXX3_CC  ?= gcc$(HOSTSUFF_EXE)
 TOOL_GXX3_CXX ?= g++$(HOSTSUFF_EXE)
+TOOL_GXX3_PCH ?= $(TOOL_GXX3_CXX)
 TOOL_GXX3_AS  ?= gcc$(HOSTSUFF_EXE)
 ifeq ($(KBUILD_TARGET),solaris)
@@ -73 +74 @@
  TOOL_GXX3_CC  += -fmessage-length=0
  TOOL_GXX3_CXX += -fmessage-length=0
+ TOOL_GXX3_PCH += -fmessage-length=0
 endif
 
@@ -85 +87 @@
 
 TOOL_GXX3_CXXOBJSUFF       ?= .o
-TOOL_GXX3_CXXOBJSUFF       ?= .o
 TOOL_GXX3_CXXFLAGS         ?=
 TOOL_GXX3_CXXFLAGS.debug   ?= -g
@@ -92 +93 @@
 TOOL_GXX3_CXXINCS          ?=
 TOOL_GXX3_CXXDEFS          ?=
+
+TOOL_GXX3_PCHOBJSUFF       ?= .h.gch
+TOOL_GXX3_PCHFLAGS         ?= $(TOOL_GXX3_CXXFLAGS)
+TOOL_GXX3_PCHFLAGS.debug   ?= $(TOOL_GXX3_CXXFLAGS.debug)
+TOOL_GXX3_PCHFLAGS.profile ?= $(TOOL_GXX3_CXXFLAGS.profile)
+TOOL_GXX3_PCHFLAGS.release ?= $(TOOL_GXX3_CXXFLAGS.release)
+TOOL_GXX3_PCHINCS          ?= $(TOOL_GXX3_CXXINCS)
+TOOL_GXX3_PCHDEFS          ?= $(TOOL_GXX3_CXXDEFS)
 
 TOOL_GXX3_ASFLAGS          ?= -x assembler-with-cpp
@@ -163 +172 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_GXX3_COMPILE_CXX_DEPEND =
 TOOL_GXX3_COMPILE_CXX_DEPORD =
 ifdef KBUILD_USE_KOBJCACHE
 TOOL_GXX3_COMPILE_CXX_USES_KOBJCACHE = 1
+TOOL_GXX3_COMPILE_CXX_DEPEND =
 TOOL_GXX3_COMPILE_CXX_OUTPUT = $(outbase).ii
 define TOOL_GXX3_COMPILE_CXX_CMDS
@@ -183 +192 @@
 endef
 else # !KBUILD_USE_KOBJCACHE
+TOOL_GXX3_COMPILE_CXX_DEPEND = $($(target)_1_GCC_PCH_FILE)
 TOOL_GXX3_COMPILE_CXX_OUTPUT =
 define TOOL_GXX3_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_GXX3_CXX) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-                -o $(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 -H -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
                 $(abspath $(source))
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
 endif # !KBUILD_USE_KOBJCACHE
+
+
+## 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_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\
+                $(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