Changeset 210 for trunk/kBuild/tools

Timestamp:

Jan 7, 2005, 11:41:35 PM (21 years ago)

Author:

bird

Message:

Playing with mapfiles.

File:

• trunk/kBuild/tools/GCC3.kmk (modified) (4 diffs)

trunk/kBuild/tools/GCC3.kmk

@@ -65 +65 @@
 TOOL_GCC3_LDFLAGS.sysmod     := -r
 TOOL_GCC3_LD_SONAME           = -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
-
+ifeq ($(BUILD_TARGET),os2)
+TOOL_GCC3_LD_MAP                          = -Zmap $(1)
+else
+TOOL_GCC3_LD_MAP                          = -Wl,-Map -Wl,$(1).map -Wl,--cref
+endif
 ifdef SLKRUNS
 TOOL_GCC3_CC  += -fmessage-length=0
@@ -189 +193 @@
 endif
         $(TOOL_GCC3_LD) $(flags) -o $$@ $(objs) \
-        $(foreach p,$(libpath), -L$(p)) \
-        $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
+                $(foreach p,$(libpath), -L$(p)) \
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
+                $(call TOOL_GCC3_LD_MAP,$(outbase))
 ifneq ($(custom_post),)
         $(eval $(custom_post))
@@ -220 +225 @@
 endif
         $(TOOL_GCC3_LD) $(TOOL_GCC3_LDFLAGS.dll) $(flags) -o $$@ \
-        $(if $(filter linux, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(dll))) \
-        $(objs) \
-        $(foreach p,$(libpath), -L$(p)) \
-        $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
+                $(if $(filter linux, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(dll))) \
+                $(objs) \
+                $(foreach p,$(libpath), -L$(p)) \
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
+                $(call TOOL_GCC3_LD_MAP,$(outbase))
 ifneq ($(custom_post),)
         $(eval $(custom_post))
@@ -253 +259 @@
         $(TOOL_GCC3_LD_SYSMOD) $(TOOL_GCC3_LDFLAGS.sysmod) $(flags) -o $$@ $(objs) \
                 $(foreach p,$(libpath), -L$(p)) \
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
+                $(call TOOL_GCC3_LD_MAP,$(outbase))
 ifneq ($(custom_post),)
         $(eval $(custom_post))