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

Timestamp:

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

Author:

bird

Message:

tools/G*: debug splitting.

File:

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

trunk/kBuild/tools/GCC32.kmk

@@ -59 +59 @@
 TOOL_GCC32_LD_SYSMOD_MAP ?=
 endif
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GCC32_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
+else
+ TOOL_GCC32_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
+endif
+
 ifdef SLKRUNS
-TOOL_GCC32_CC  += -fmessage-length=0
-TOOL_GCC32_CXX += -fmessage-length=0
+ TOOL_GCC32_CC  += -fmessage-length=0
+ TOOL_GCC32_CXX += -fmessage-length=0
 endif
 
@@ -227 +233 @@
         $(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_GCC32_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'
@@ -249 +258 @@
 TOOL_GCC32_LINK_PROGRAM_OUTPUT =
 TOOL_GCC32_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map
-TOOL_GCC32_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GCC32_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).debug
+TOOL_GCC32_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
+TOOL_GCC32_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GCC32_LINK_PROGRAM_DEPORD =
 define TOOL_GCC32_LINK_PROGRAM_CMDS
@@ -256 +268 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 $(call TOOL_GCC32_LD_MAP,$(outbase).map)
+ ifeq ($(ld_debug),split)
+        $(TOOL_GCC32_OBJCOPY) --only-keep-debug $(out) $(outbase).debug
+        $(CHMOD) a-x $(outbase).debug
+        $(TOOL_GCC32_OBJCOPY) --strip-debug --strip-unneeded --add-gnu-debuglink=$(outbase).debug $(out)
+ endif
 endef
 
@@ -274 +291 @@
 TOOL_GCC32_LINK_DLL_OUTPUT =
 TOOL_GCC32_LINK_DLL_OUTPUT_MAYBE = $(outbase).map
-TOOL_GCC32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GCC32_LINK_DLL_OUTPUT_DEBUG = $(outbase).debug
+TOOL_GCC32_LINK_DLL_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
+TOOL_GCC32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GCC32_LINK_DLL_DEPORD =
 define TOOL_GCC32_LINK_DLL_CMDS
@@ -283 +303 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 $(call TOOL_GCC32_LD_MAP,$(outbase).map)
+ ifeq ($(ld_debug),split)
+        $(TOOL_GCC32_OBJCOPY) --only-keep-debug $(out) $(outbase).debug
+        $(CHMOD) a-x $(outbase).debug
+        $(TOOL_GCC32_OBJCOPY) --strip-debug --strip-unneeded --add-gnu-debuglink=$(outbase).debug $(out)
+ endif
 endef
 
@@ -301 +326 @@
 TOOL_GCC32_LINK_SYSMOD_OUTPUT =
 TOOL_GCC32_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).map
-TOOL_GCC32_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GCC32_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).debug
+TOOL_GCC32_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
+TOOL_GCC32_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GCC32_LINK_SYSMOD_DEPORD =
 define TOOL_GCC32_LINK_SYSMOD_CMDS
         $(QUIET)$(TOOL_GCC32_LD_SYSMOD) $(TOOL_GCC32_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_GCC32_LD_SYSMOD_MAP,$(outbase).map)
-endef
-
+ ifeq ($(ld_debug),split)
+        $(TOOL_GCC32_OBJCOPY) --only-keep-debug $(out) $(outbase).debug
+        $(CHMOD) a-x $(outbase).debug
+        $(TOOL_GCC32_OBJCOPY) --strip-debug --strip-unneeded --add-gnu-debuglink=$(outbase).debug $(out)
+ endif
+endef
+