From b8286d45be0cdaffccfe684dde7385e2c042141d Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Sat, 3 Jul 2010 20:58:22 +0000
Subject: Move -Wl,-z,defs to GLOBAL_LDOPTS (instead of GCCOPTS), to avoid
 noise in older gcc output when not linking

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27260 a1c6a512-1295-4272-9138-f99709370657
---
 tools/configure | 7 ++++++-
 tools/root.make | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/configure b/tools/configure
index 70580db..c7185f0 100755
--- a/tools/configure
+++ b/tools/configure
@@ -9,7 +9,10 @@
 #
 
 # global CC options for all platforms
-CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe -Wl,-z,defs"
+CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe"
+
+# global LD options for all platforms
+GLOBAL_LDOPTS="-Wl,-z,defs"
 
 use_logf="#undef ROCKBOX_HAS_LOGF"
 use_bootchart="#undef DO_BOOTCHART"
@@ -3097,6 +3100,7 @@ sed > Makefile \
  -e "s<@GCCOPTS@<${GCCOPTS}<g" \
  -e "s<@TARGET_INC@<${TARGET_INC}<g" \
  -e "s<@LDOPTS@<${LDOPTS}<g" \
+ -e "s<@GLOBAL_LDOPTS@<${GLOBAL_LDOPTS}<g" \
  -e "s<@LOADADDRESS@<${loadaddress}<g" \
  -e "s<@EXTRADEF@<${extradefines}<g" \
  -e "s<@APPSDIR@<${appsdir}<g" \
@@ -3176,6 +3180,7 @@ export TARGET_INC=@TARGET_INC@
 export LOADADDRESS=@LOADADDRESS@
 export SHARED_FLAG=@SHARED_FLAG@
 export LDOPTS=@LDOPTS@
+export GLOBAL_LDOPTS=@GLOBAL_LDOPTS@
 export GCCVER=@GCCVER@
 export GCCNUM=@GCCNUM@
 export UNAME=@UNAME@
diff --git a/tools/root.make b/tools/root.make
index e30b5b3..2b4dfb6 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -164,13 +164,13 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(L
 		-L$(BUILDDIR)/firmware -lfirmware \
 		-L$(BUILDDIR)/lib -lskin_parser \
 		-L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \
-		-lgcc $(BOOTBOXLDOPTS) \
+		-lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
 		-T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map
 
 $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKROM)
 	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
-		$(VOICESPEEXLIB) $(FIRMLIB) -lgcc -L$(BUILDDIR)/firmware \
-		-T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map
+		$(VOICESPEEXLIB) $(FIRMLIB) -lgcc $(GLOBAL_LDOPTS) \
+                -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map
 
 $(BUILDDIR)/rockbox.bin : $(BUILDDIR)/rockbox.elf
 	$(call PRINTS,OC $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@
-- 
cgit v1.1