From 6d19275876bf8a92d966e1b64d433a7edabb3a91 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Tue, 17 Jan 2012 15:08:08 +0100
Subject: [PATCH] Hosted: Output map files after linking.

Change-Id: I5ac64d781aaa1aa2b3157589f8e689c0d946a39f
---
 android/android.make                      | 2 +-
 apps/codecs/codecs.make                   | 2 +-
 apps/plugins/imageviewer/imageviewer.make | 2 +-
 apps/plugins/plugins.make                 | 2 +-
 uisimulator/uisimulator.make              | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/android/android.make b/android/android.make
index 6180ef64da..a62c47e188 100644
--- a/android/android.make
+++ b/android/android.make
@@ -115,7 +115,7 @@ classes: $(R_OBJ) $(JAVA_OBJ)
 
 
 $(BUILDDIR)/$(BINARY): $$(OBJ) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB) $(CPUFEAT_BUILD)/cpu-features.o
-	$(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS)
+	$(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
 	$(call PRINTS,OC $(@F))$(OC) -S -x $@
 
 $(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index e18b92c1f0..ffa21a39db 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -186,7 +186,7 @@ $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S
 		-I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@
 
 ifdef APP_TYPE
- CODECLDFLAGS = $(SHARED_LDFLAG) # <-- from Makefile
+ CODECLDFLAGS = $(SHARED_LDFLAG) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map
  CODECFLAGS += $(SHARED_CFLAGS) # <-- from Makefile
 else
  CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map
diff --git a/apps/plugins/imageviewer/imageviewer.make b/apps/plugins/imageviewer/imageviewer.make
index 8f933e3046..f5bd6c0122 100644
--- a/apps/plugins/imageviewer/imageviewer.make
+++ b/apps/plugins/imageviewer/imageviewer.make
@@ -32,7 +32,7 @@ ifndef APP_TYPE
     IMGDEC_OUTLDS = $(IMGVBUILDDIR)/%.link
     IMGDEC_OVLFLAGS = -T$(IMGVBUILDDIR)/$*.link -Wl,--gc-sections -Wl,-Map,$(IMGVBUILDDIR)/$*.map
 else
-    IMGDEC_OVLFLAGS = $(PLUGINLDFLAGS)
+    IMGDEC_OVLFLAGS = $(PLUGINLDFLAGS) -Wl,-Map,$(IMGVBUILDDIR)/$*.map
 endif
 
 $(IMGVBUILDDIR)/%.ovl: $(IMGDEC_OUTLDS)
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 1bf78d82c1..76cdea63f0 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -105,7 +105,7 @@ $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@
 
 ifdef APP_TYPE
- PLUGINLDFLAGS = $(SHARED_LDFLAG) # <-- from Makefile
+ PLUGINLDFLAGS = $(SHARED_LDFLAG) -Wl,-Map,$*.map
  PLUGINFLAGS += $(SHARED_CFLAGS) # <-- from Makefile
 else
  PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make
index d30a9db9ae..03bf9da2bd 100644
--- a/uisimulator/uisimulator.make
+++ b/uisimulator/uisimulator.make
@@ -31,7 +31,8 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
 $(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB)
-	$(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS)
+	$(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) \
+	-Wl,-Map,$(BUILDDIR)/rockbox.map
 
 $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c
 	$(SILENT)mkdir -p $(dir $@)