diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 96c12dee35..aab23b01a2 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make @@ -121,6 +121,7 @@ else CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map CODECFLAGS += -UDEBUG -DNDEBUG endif +CODECLDFLAGS += $(GLOBAL_LDOPTS) $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECLIB) $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \ diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index febc80ac95..4bd0cc952e 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -87,6 +87,7 @@ else PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map OVERLAYLDFLAGS = -T$(OVERLAYREF_LDS) -Wl,--gc-sections -Wl,-Map,$*.refmap endif +PLUGINLDFLAGS += $(GLOBAL_LDOPTS) $(BUILDDIR)/%.rock: $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(BUILDDIR)/$*.elf \ diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make index a2883fb2af..0118235bb7 100644 --- a/bootloader/bootloader.make +++ b/bootloader/bootloader.make @@ -24,6 +24,7 @@ $(BOOTLINK): $(BOOTLDS) $(BUILDDIR)/bootloader.elf: $$(OBJ) $$(FIRMLIB) $$(BOOTLINK) $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ $(FIRMLIB) -lgcc -L$(BUILDDIR)/firmware -T$(BOOTLINK) \ + $(GLOBAL_LDOPTS) \ -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map $(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf diff --git a/tools/configure b/tools/configure index 70580dbfe0..c7185f0982 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}