Changeset 2541 for trunk/kBuild/tools/GXX32.kmk

Timestamp:

Aug 3, 2011, 11:51:30 AM (14 years ago)

Author:

bird

Message:

tools/G*: debug splitting.

File:

• trunk/kBuild/tools/GXX32.kmk (modified) (7 diffs)

trunk/kBuild/tools/GXX32.kmk

@@ -101 +101 @@
 
 
-
 ## Compile C source.
 # @param    $(target)   Normalized main target name.
@@ -233 +232 @@
         $(QUIET)$(APPEND) -n $(out).ar-script \
                 $(foreach o,$(objs), 'ADDMOD $(o)') \
-                $(foreach o,$(othersrc), 'ADDLIB $(o)')
+                $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
+        $(if $(filter %.def %.imp,$(othersrc))\
+                ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
+                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
         $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
         $(QUIET)$(APPEND) $(out).ar-script 'END'
@@ -257 +259 @@
 TOOL_GXX32_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).debug
 TOOL_GXX32_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
-TOOL_GXX32_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GXX32_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GXX32_LINK_PROGRAM_DEPORD =
 define TOOL_GXX32_LINK_PROGRAM_CMDS
@@ -267 +270 @@
         $(TOOL_GXX32_OBJCOPY) --only-keep-debug $(out) $(outbase).debug
         $(CHMOD) a-x $(outbase).debug
-        $(TOOL_GXX32_OBJCOPY) --strip-debug $(out)
-        $(TOOL_GXX32_OBJCOPY) --add-gnu-debuglink=$(outbase).debug $(out)
+        $(TOOL_GXX32_OBJCOPY) --strip-debug --strip-unneeded --add-gnu-debuglink=$(outbase).debug $(out)
  endif
 endef
@@ -288 +290 @@
 TOOL_GXX32_LINK_DLL_OUTPUT =
 TOOL_GXX32_LINK_DLL_OUTPUT_MAYBE = $(outbase).map
-TOOL_GXX32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GXX32_LINK_DLL_OUTPUT_DEBUG = $(outbase).debug
+TOOL_GXX32_LINK_DLL_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
+TOOL_GXX32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GXX32_LINK_DLL_DEPORD =
 define TOOL_GXX32_LINK_DLL_CMDS
@@ -297 +302 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 $(call TOOL_GXX32_LD_MAP,$(outbase).map)
+ ifeq ($(ld_debug),split)
+        $(TOOL_GXX32_OBJCOPY) --only-keep-debug $(out) $(outbase).debug
+        $(CHMOD) a-x $(outbase).debug
+        $(TOOL_GXX32_OBJCOPY) --strip-debug --strip-unneeded --add-gnu-debuglink=$(outbase).debug $(out)
+ endif
 endef
 
@@ -315 +325 @@
 TOOL_GXX32_LINK_SYSMOD_OUTPUT =
 TOOL_GXX32_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).map
-TOOL_GXX32_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GXX32_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).debug
+TOOL_GXX32_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
+TOOL_GXX32_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GXX32_LINK_SYSMOD_DEPORD =
 define TOOL_GXX32_LINK_SYSMOD_CMDS
         $(QUIET)$(TOOL_GXX32_LD_SYSMOD) $(TOOL_GXX32_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
+                $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 $(call TOOL_GXX32_LD_SYSMOD_MAP,$(outbase).map)
-endef
-
+ ifeq ($(ld_debug),split)
+        $(TOOL_GXX32_OBJCOPY) --only-keep-debug $(out) $(outbase).debug
+        $(CHMOD) a-x $(outbase).debug
+        $(TOOL_GXX32_OBJCOPY) --strip-debug --strip-unneeded --add-gnu-debuglink=$(outbase).debug $(out)
+ endif
+endef
+