Changeset 2535 in kBuild

Timestamp:

Aug 2, 2011 7:05:34 PM (13 years ago)

Author:

bird

Message:

footer-pass2-compiling-targets.kmk,G??4MACHO.kmk: debug info splitting fixes (mac related + generic).

Location:

trunk/kBuild

Files:

• footer-pass2-compiling-targets.kmk (modified) (4 diffs)
• tools/GCC4MACHO.kmk (modified) (6 diffs)
• tools/GXX4MACHO.kmk (modified) (6 diffs)

trunk/kBuild/footer-pass2-compiling-targets.kmk

@@ -390 +390 @@
 # @param    debug_dir           The directory name.
 define def_link_install_debug_dir_rule
-local dir := $(debug_inst_path)/$(debug_inst)$(debug_dir)
+local dir := $(debug_inst_path)/$(debug_inst2)$(debug_dir)
 $$(call KB_FN_ASSERT_ABSPATH,dir)
 $$(dir): | $$$$(dir $$$$(patsubst %/,%,$$$$@))
@@ -402 +402 @@
 # @param    debug_file          Src=>Dst file pair.
 define def_link_install_debug_file_rule
-local dst := $(debug_inst_path)/$(debug_inst)$(word 2, $(subst =>,$(SP),$(debug_file)))
+local dst := $(debug_inst_path)/$(debug_inst2)$(word 2, $(subst =>,$(SP),$(debug_file)))
 $$(call KB_FN_ASSERT_ABSPATH,dst)
 local src := $(word 1, $(subst =>,$(SP),$(debug_file)))
 $$(call KB_FN_ASSERT_ABSPATH,src)
 $$(dst): $$(src) | $$$$(dir $$$$@)
-        %$$(call MSG_INST_FILE,$$@,$$<)
+        %$$(call MSG_INST_FILE,$$<,$$@)
         $$(QUIET)$(debug_install_cmd) $(if $(mode),-m $(mode)) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) -- $$< $$@
 $(target)_2_DEBUG_$(debug_var)_TARGET_FILES += $$(dst)
@@ -418 +418 @@
 if "$(substr $(debug_inst),-1,1)" == "/"
  if "$(debug_inst)" == "./"
-  local debug_inst :=
+  local debug_inst2 :=
+ else
+  local debug_inst2 := $(debug_inst)
  endif
  local debug_dirs  := $(patsubst $($(target)_0_OUTDIR)/%,%,$($(target)_2_OUTPUT_DEBUG_DIRS))
@@ -427 +429 @@
                         ,$($(target)_0_OUTDIR)/$(file)=>$(file))
 else
- local debug_files := $(call TOOL_$(tool)_$(tool_do)_DEBUG_INSTALL_FN,$(out),$(outbase),$(debug_inst))
+ local debug_notdir:= $(notdir $(debug_inst))
+ local debug_inst2 := $(dir $(debug_inst))
+ local debug_files := $(call TOOL_$(tool)_$(tool_do)_DEBUG_INSTALL_FN,$(out),$(outbase),$(debug_notdir))
  local debug_dirs  := $(filter     %/,$(debug_files))
  local debug_files := $(filter-out %/,$(debug_files))

trunk/kBuild/tools/GCC4MACHO.kmk

@@ -106 +106 @@
 TOOL_GCC4MACHO_LDFLAGS.profile  ?= -g
 
+TOOL_GCC4MACHO_STRIP_PROGRAM    ?= strip -SXxru
+TOOL_GCC4MACHO_STRIP_DLL        ?= strip -Sxru
+TOOL_GCC4MACHO_STRIP_SYSMOD     ?= strip -Sru
+
 
 ##
 # Calculate the files in the debug bundle.
 # @param    1           The whole output filename.
-# @param    2           The output filename sans suffix. 
+# @param    2           The output filename sans suffix.
 TOOL_GCC4MACHO_DEBUG_BUNDLE_FN = \
     $(1).dSYM/ \
@@ -122 +126 @@
 # Calculate the files in the debug bundle.
 # @param    1           The whole linker output filename.
-# @param    2           The linker output filename sans suffix. 
+# @param    2           The linker output filename sans suffix.
 # @param    3           The desired install name (no dir slash).
+# @remarks  The Info.plist has some reference to the original name, but gdb
+#           does not care and only check for a symbol file in the DWARF
+#           directory with the same name as the debugged module.
 TOOL_GCC4MACHO_DEBUG_INSTALL_FN= \
     $(3).dSYM/ \
@@ -130 +137 @@
     $(3).dSYM/Contents/Resources/DWARF/ \
     $(1).dSYM/Contents/Info.plist=>$(3).dSYM/Contents/Info.plist \
-    $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))=>$(3).dSYM/Contents/Resources/DWARF/$(notdir $(1))
+    $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))=>$(3).dSYM/Contents/Resources/DWARF/$(notdir $(3))
 
 
@@ -388 +395 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
  ifeq ($(ld_debug),split)
-        $(QUIET)$(TOOL_GCC4MACHO_DSYMUTIL) --verbose -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GCC4MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GCC4MACHO_STRIP_PROGRAM) $(out)
  endif
 endef
@@ -420 +428 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
  ifeq ($(ld_debug),split)
-        $(QUIET)$(TOOL_GCC4MACHO_DSYMUTIL) --verbose -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GCC4MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GCC4MACHO_STRIP_DLL) $(out)
  endif
 endef
@@ -450 +459 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
  ifeq ($(ld_debug),split)
-        $(QUIET)$(TOOL_GCC4MACHO_DSYMUTIL) --verbose -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GCC4MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GCC4MACHO_STRIP_SYSMOD) $(out)
  endif
 endef

trunk/kBuild/tools/GXX4MACHO.kmk

@@ -106 +106 @@
 TOOL_GXX4MACHO_LDFLAGS.profile  ?= -g
 
+TOOL_GXX4MACHO_STRIP_PROGRAM    ?= strip -SXxru
+TOOL_GXX4MACHO_STRIP_DLL        ?= strip -Sxru
+TOOL_GXX4MACHO_STRIP_SYSMOD     ?= strip -Sru
+
 
 ##
@@ -124 +128 @@
 # @param    2           The linker output filename sans suffix.
 # @param    3           The desired install name (no dir slash).
+# @remarks  The Info.plist has some reference to the original name, but gdb
+#           does not care and only check for a symbol file in the DWARF
+#           directory with the same name as the debugged module.
 TOOL_GXX4MACHO_DEBUG_INSTALL_FN= \
     $(3).dSYM/ \
@@ -130 +137 @@
     $(3).dSYM/Contents/Resources/DWARF/ \
     $(1).dSYM/Contents/Info.plist=>$(3).dSYM/Contents/Info.plist \
-    $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))=>$(3).dSYM/Contents/Resources/DWARF/$(notdir $(1))
+    $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))=>$(3).dSYM/Contents/Resources/DWARF/$(notdir $(3))
 
 
@@ -388 +395 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
  ifeq ($(ld_debug),split)
-        $(QUIET)$(TOOL_GXX4MACHO_DSYMUTIL) --verbose -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GXX4MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GXX4MACHO_STRIP_PROGRAM) $(out)
  endif
 endef
@@ -419 +427 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
  ifeq ($(ld_debug),split)
-        $(QUIET)$(TOOL_GXX4MACHO_DSYMUTIL) --verbose -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GXX4MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GXX4MACHO_STRIP_DLL) $(out)
  endif
 endef
@@ -449 +458 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
  ifeq ($(ld_debug),split)
-        $(QUIET)$(TOOL_GXX4MACHO_DSYMUTIL) --verbose -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GXX4MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
+        $(QUIET)$(TOOL_GXX4MACHO_STRIP_SYSMOD) $(out)
  endif
 endef