Changeset 3250

Timestamp:

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

Author:

bird

Message:

Working on precompiled headers for GCC.

Location:

trunk/kBuild

Files:

• header.kmk (modified) (5 diffs)
• tools/GXX3.kmk (modified) (6 diffs)
• units/gccprecomp.kmk (copied) (copied from trunk/kBuild/units/vccprecomp.kmk ) (3 diffs)

trunk/kBuild/header.kmk ¶

@@ -1090 +1090 @@
 ## PROPS_TOOLS
 # This is a subset of PROPS_SINGLE.
-PROPS_TOOLS := TOOL CTOOL CXXTOOL OBJCTOOL OBJCXXTOOL ASTOOL RCTOOL ARTOOL LDTOOL FETCHTOOL UNPACKTOOL PATCHTOOL
+PROPS_TOOLS := TOOL CTOOL CXXTOOL PCHTOOL OBJCTOOL OBJCXXTOOL ASTOOL RCTOOL ARTOOL LDTOOL FETCHTOOL UNPACKTOOL PATCHTOOL
 
 ## PROPS_SINGLE
@@ -1097 +1097 @@
 # will do the necessary inheritance for templates, sdks, tools and targets.
 PROPS_SINGLE := $(PROPS_TOOLS) TEMPLATE INSTTYPE INST STAGE NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU FETCHDIR \
-        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF OBJCXXOBJSUFF ASOBJSUFF RCOBJSUFF SYSSUFF BINSUFF EXESUFF DLLSUFF LIBSUFF ARLIBSUFF \
+        OBJSUFF COBJSUFF CXXOBJSUFF PCHOBJSUFF OBJCOBJSUFF OBJCXXOBJSUFF ASOBJSUFF RCOBJSUFF SYSSUFF BINSUFF EXESUFF DLLSUFF LIBSUFF ARLIBSUFF \
         MODE UID GID LD_DEBUG DEBUG_INSTTYPE DEBUG_INST DEBUG_STAGE
 ## PROPS_SINGLE_LNK
@@ -1120 +1120 @@
         CFLAGS CDEFS \
         CXXFLAGS CXXDEFS \
+        PCHFLAGS PCHDEFS \
         OBJCFLAGS OBJCDEFS \
         OBJCXXFLAGS OBJCXXDEFS \
@@ -1138 +1139 @@
 PROPS_ACCUMULATE_L := \
         SDKS USES SOURCES EXEC_SOURCES SRC_HANDLERS INTERMEDIATES \
-        INCS CINCS CXXINCS OBJCINCS OBJCXXINCS ASINCS RCINCS \
+        INCS CINCS CXXINCS PCHINCS OBJCINCS OBJCXXINCS ASINCS RCINCS \
         LIBS LIBPATH \
         DIRS BLDDIRS CLEAN
@@ -1208 +1209 @@
 ## KBUILD_COMPILE_CATEGTORIES
 # Tools categories for compiling.
-KBUILD_COMPILE_CATEGTORIES   := AS C CXX OBJC OBJCXX RC
+KBUILD_COMPILE_CATEGTORIES   := AS C CXX PCH OBJC OBJCXX RC
 
 ## KBUILD_GENERIC_CATEGORIES

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
 
 

trunk/kBuild/units/gccprecomp.kmk ¶

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Unit - Target Level Precompiled Headers for Visual C++.
+# kBuild Unit - Target Level Precompiled Headers for GNU GCC.
 #
 
@@ -33 +33 @@
 
 
-UNIT_vccprecomp = Target level precompiled Headers for Visual C++
+UNIT_gccprecomp = Target level precompiled Headers for Visual C++
 
 #
 # Early target processing pass #1.
 #
-# This set the internal _VCC_PCH_FILE and VCC_COMMON_OBJ_PDB properties,
-# which will be picked up by the VCCxxx tool.
+# This sets $(target)_1_GCC_PCH_DIR as the include directory for the precompiled
+# header, adding it to BLDDIRS to get a mkdir rule for it, and then calculates the
+# .gch name and stores that in $(target)_1_GCC_PCH_FILE for compile rule dependencies.
 #
-define def_unit_vccprecomp_target_pre
- $(target)_1_VCC_PCH_FILE       := $(outbase)-pch.pch
- $(target)_1_VCC_COMMON_OBJ_PDB := $(outbase)-common-obj.pdb
+define def_unit_gccprecomp_target_pre
+ $(target)_BLDDIRS        += $($(target)_0_OUTDIR)/pch/
+ $(target)_1_GCC_PCH_DIR  := $($(target)_0_OUTDIR)/pch/
+ $(target)_1_GCC_PCH_FILE := $($(target)_0_OUTDIR)/pch/$(notdir $($(target)_PCH_HDR)).gch
 endef
 
@@ -49 +51 @@
 # Early target processing pass #2.
 #
-# This sets up a rule for creating the .pch file after qt5 and similar units
+# This sets up a rule for creating the .gch file after qt5 and similar units
 # are done modifying INCS, DEFS and company.  The 'tool' variable is defined by
 # footer-pass2-compiling-targets.kmk and is really the LD tool, but that'll
-# have to do for now.  The '-PCH' variant of the VCC tool, is defined together
+# have to do for now.  The '-PCH' variant of the GCC/LLVM tool, is defined together
 # with $(tool) and allow us to bypass the options and dependencies triggered
 # by _1_VCC_PCH_FILE, _1_VCC_COMMON_OBJ_PDB and _PCH_HDR, and also make sure we
 # don't get circular dependencies by way of kDepObj and the debug info.
 #
-define def_unit_vccprecomp_target_pre_2
+define def_unit_gccprecomp_target_pre_2
  local source := $($(target)_PCH_HDR)
- $(source)_TOOL := $(tool)-PCH
  local suff   := $(suffix $(source))
- local type   := CXX
+ local type   := PCH
  $(kb-src-one 2)
 endef