build: Get rid of suplerflous '-Os' references in linker calls

We should be using global optimization flags, and -Os is already our default. Change-Id: Iaba511b2b4fa2ee0f1eb1ad28024be954f4c5f03
author: Solomon Peachy <pizza@shaftnet.org> 2021-03-25 12:14:28 -0400
committer: Solomon Peachy <pizza@shaftnet.org> 2021-03-25 12:20:15 -0400
commit: d5cc74ebd86a753547349cefcea3ed552e94c5dd (patch)
tree: 2e30b4213709cccd315dd50a285e96831a9fa4ac
parent: d121aa3fe85ba5205b605088d80e70da668b45c0 (diff)
download: rockbox-d5cc74ebd86a753547349cefcea3ed552e94c5dd.tar.gz
rockbox-d5cc74ebd86a753547349cefcea3ed552e94c5dd.zip
8 files changed, 14 insertions, 14 deletions
diff --git a/firmware/target/hosted/agptek/rocker.make b/firmware/target/hosted/agptek/rocker.make
index d159db77f3..117ecb8eac 100644
--- a/firmware/target/hosted/agptek/rocker.make
+++ b/firmware/target/hosted/agptek/rocker.make
@@ -25,7 +25,7 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
 # bootloader build
 $(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
                $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -37,7 +37,7 @@ else
 # rockbox app build
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
diff --git a/firmware/target/hosted/aigo/erosq.make b/firmware/target/hosted/aigo/erosq.make
index d159db77f3..117ecb8eac 100644
--- a/firmware/target/hosted/aigo/erosq.make
+++ b/firmware/target/hosted/aigo/erosq.make
@@ -25,7 +25,7 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
 # bootloader build
 $(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
                $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -37,7 +37,7 @@ else
 # rockbox app build
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
diff --git a/firmware/target/hosted/fiio/fiio.make b/firmware/target/hosted/fiio/fiio.make
index d159db77f3..117ecb8eac 100644
--- a/firmware/target/hosted/fiio/fiio.make
+++ b/firmware/target/hosted/fiio/fiio.make
@@ -25,7 +25,7 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
 # bootloader build
 $(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
                $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -37,7 +37,7 @@ else
 # rockbox app build
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
diff --git a/firmware/target/hosted/samsungypr/ypr0/ypr0.make b/firmware/target/hosted/samsungypr/ypr0/ypr0.make
index 67ff326de0..3583293a0f 100644
--- a/firmware/target/hosted/samsungypr/ypr0/ypr0.make
+++ b/firmware/target/hosted/samsungypr/ypr0/ypr0.make
@@ -14,7 +14,7 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
 .SECONDEXPANSION: # $$(OBJ) is not populated until after this
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
diff --git a/firmware/target/hosted/samsungypr/ypr1/ypr1.make b/firmware/target/hosted/samsungypr/ypr1/ypr1.make
index 67ff326de0..3583293a0f 100644
--- a/firmware/target/hosted/samsungypr/ypr1/ypr1.make
+++ b/firmware/target/hosted/samsungypr/ypr1/ypr1.make
@@ -14,7 +14,7 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
 .SECONDEXPANSION: # $$(OBJ) is not populated until after this
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
diff --git a/firmware/target/hosted/sonynwz/sonynwz.make b/firmware/target/hosted/sonynwz/sonynwz.make
index 6c58e1a709..bf2d0aa53c 100644
--- a/firmware/target/hosted/sonynwz/sonynwz.make
+++ b/firmware/target/hosted/sonynwz/sonynwz.make
@@ -45,7 +45,7 @@ $(BUILDDIR)/bootloader.fnt: $(BL_FONT) $(TOOLS)
        $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -f -o $@ $<
 $(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
                $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -69,7 +69,7 @@ $(BUILDDIR)/$(BINARY): $(BUILDDIR)/bootloader.elf $(BUILDDIR)/bootloader.fnt
 else # bootloader
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
diff --git a/firmware/target/hosted/xduoo/xduoo.make b/firmware/target/hosted/xduoo/xduoo.make
index d159db77f3..117ecb8eac 100644
--- a/firmware/target/hosted/xduoo/xduoo.make
+++ b/firmware/target/hosted/xduoo/xduoo.make
@@ -25,7 +25,7 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
 # bootloader build
 $(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
                $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -37,7 +37,7 @@ else
 # rockbox app build
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware -lfirmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
diff --git a/tools/root.make b/tools/root.make
index 296ca849de..2c6c8474e7 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -260,7 +260,7 @@ $(LINKROM): $(ROMLDS)
 # Note: make sure -Wl,--gc-sections comes before -T in the linker options.
 # Having the latter first caused crashes on (at least) mini2g.
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -nostdlib -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
@@ -268,7 +268,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LI
                -Wl,-Map,$(BUILDDIR)/rockbox.map
 $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM)
-        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
+        $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -nostdlib -o $@ $(OBJ) \
                -L$(BUILDDIR)/firmware \
                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
author	Solomon Peachy <pizza@shaftnet.org>	2021-03-25 12:14:28 -0400
committer	Solomon Peachy <pizza@shaftnet.org>	2021-03-25 12:20:15 -0400
commit	d5cc74ebd86a753547349cefcea3ed552e94c5dd (patch)
tree	2e30b4213709cccd315dd50a285e96831a9fa4ac
parent	d121aa3fe85ba5205b605088d80e70da668b45c0 (diff)
download	rockbox-d5cc74ebd86a753547349cefcea3ed552e94c5dd.tar.gz rockbox-d5cc74ebd86a753547349cefcea3ed552e94c5dd.zip

diff --git a/firmware/target/hosted/agptek/rocker.make b/firmware/target/hosted/agptek/rocker.make index d159db77f3..117ecb8eac 100644 --- a/firmware/target/hosted/agptek/rocker.make +++ b/firmware/target/hosted/agptek/rocker.make
@@ -25,7 +25,7 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
25	# bootloader build	25	# bootloader build
26		26
27	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)	27	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
28	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	28	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
29	-L$(BUILDDIR)/firmware -lfirmware \	29	-L$(BUILDDIR)/firmware -lfirmware \
30	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	30	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
31	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map	31	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -37,7 +37,7 @@ else
37	# rockbox app build	37	# rockbox app build
38		38
39	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)	39	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
40	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	40	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
41	-L$(BUILDDIR)/firmware -lfirmware \	41	-L$(BUILDDIR)/firmware -lfirmware \
42	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	42	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
43	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	43	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \


diff --git a/firmware/target/hosted/aigo/erosq.make b/firmware/target/hosted/aigo/erosq.make index d159db77f3..117ecb8eac 100644 --- a/firmware/target/hosted/aigo/erosq.make +++ b/firmware/target/hosted/aigo/erosq.make
@@ -25,7 +25,7 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
25	# bootloader build	25	# bootloader build
26		26
27	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)	27	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
28	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	28	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
29	-L$(BUILDDIR)/firmware -lfirmware \	29	-L$(BUILDDIR)/firmware -lfirmware \
30	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	30	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
31	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map	31	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -37,7 +37,7 @@ else
37	# rockbox app build	37	# rockbox app build
38		38
39	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)	39	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
40	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	40	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
41	-L$(BUILDDIR)/firmware -lfirmware \	41	-L$(BUILDDIR)/firmware -lfirmware \
42	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	42	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
43	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	43	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \


diff --git a/firmware/target/hosted/fiio/fiio.make b/firmware/target/hosted/fiio/fiio.make index d159db77f3..117ecb8eac 100644 --- a/firmware/target/hosted/fiio/fiio.make +++ b/firmware/target/hosted/fiio/fiio.make
@@ -25,7 +25,7 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
25	# bootloader build	25	# bootloader build
26		26
27	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)	27	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
28	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	28	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
29	-L$(BUILDDIR)/firmware -lfirmware \	29	-L$(BUILDDIR)/firmware -lfirmware \
30	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	30	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
31	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map	31	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -37,7 +37,7 @@ else
37	# rockbox app build	37	# rockbox app build
38		38
39	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)	39	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
40	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	40	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
41	-L$(BUILDDIR)/firmware -lfirmware \	41	-L$(BUILDDIR)/firmware -lfirmware \
42	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	42	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
43	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	43	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \


diff --git a/firmware/target/hosted/samsungypr/ypr0/ypr0.make b/firmware/target/hosted/samsungypr/ypr0/ypr0.make index 67ff326de0..3583293a0f 100644 --- a/firmware/target/hosted/samsungypr/ypr0/ypr0.make +++ b/firmware/target/hosted/samsungypr/ypr0/ypr0.make
@@ -14,7 +14,7 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
14	.SECONDEXPANSION: # $$(OBJ) is not populated until after this	14	.SECONDEXPANSION: # $$(OBJ) is not populated until after this
15		15
16	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)	16	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
17	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	17	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
18	-L$(BUILDDIR)/firmware -lfirmware \	18	-L$(BUILDDIR)/firmware -lfirmware \
19	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	19	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
20	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	20	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \


diff --git a/firmware/target/hosted/samsungypr/ypr1/ypr1.make b/firmware/target/hosted/samsungypr/ypr1/ypr1.make index 67ff326de0..3583293a0f 100644 --- a/firmware/target/hosted/samsungypr/ypr1/ypr1.make +++ b/firmware/target/hosted/samsungypr/ypr1/ypr1.make
@@ -14,7 +14,7 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
14	.SECONDEXPANSION: # $$(OBJ) is not populated until after this	14	.SECONDEXPANSION: # $$(OBJ) is not populated until after this
15		15
16	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)	16	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
17	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	17	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
18	-L$(BUILDDIR)/firmware -lfirmware \	18	-L$(BUILDDIR)/firmware -lfirmware \
19	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	19	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
20	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	20	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \


diff --git a/firmware/target/hosted/sonynwz/sonynwz.make b/firmware/target/hosted/sonynwz/sonynwz.make index 6c58e1a709..bf2d0aa53c 100644 --- a/firmware/target/hosted/sonynwz/sonynwz.make +++ b/firmware/target/hosted/sonynwz/sonynwz.make
@@ -45,7 +45,7 @@ $(BUILDDIR)/bootloader.fnt: $(BL_FONT) $(TOOLS)
45	$(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -f -o $@ $<	45	$(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -f -o $@ $<
46		46
47	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)	47	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
48	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	48	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
49	-L$(BUILDDIR)/firmware -lfirmware \	49	-L$(BUILDDIR)/firmware -lfirmware \
50	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	50	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
51	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map	51	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -69,7 +69,7 @@ $(BUILDDIR)/$(BINARY): $(BUILDDIR)/bootloader.elf $(BUILDDIR)/bootloader.fnt
69	else # bootloader	69	else # bootloader
70		70
71	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)	71	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
72	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	72	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
73	-L$(BUILDDIR)/firmware -lfirmware \	73	-L$(BUILDDIR)/firmware -lfirmware \
74	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	74	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
75	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	75	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \


diff --git a/firmware/target/hosted/xduoo/xduoo.make b/firmware/target/hosted/xduoo/xduoo.make index d159db77f3..117ecb8eac 100644 --- a/firmware/target/hosted/xduoo/xduoo.make +++ b/firmware/target/hosted/xduoo/xduoo.make
@@ -25,7 +25,7 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
25	# bootloader build	25	# bootloader build
26		26
27	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)	27	$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS)
28	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	28	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
29	-L$(BUILDDIR)/firmware -lfirmware \	29	-L$(BUILDDIR)/firmware -lfirmware \
30	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	30	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
31	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map	31	$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
@@ -37,7 +37,7 @@ else
37	# rockbox app build	37	# rockbox app build
38		38
39	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)	39	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
40	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \	40	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -o $@ $(OBJ) \
41	-L$(BUILDDIR)/firmware -lfirmware \	41	-L$(BUILDDIR)/firmware -lfirmware \
42	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	42	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
43	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \	43	-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \


diff --git a/tools/root.make b/tools/root.make index 296ca849de..2c6c8474e7 100644 --- a/tools/root.make +++ b/tools/root.make
@@ -260,7 +260,7 @@ $(LINKROM): $(ROMLDS)
260	# Note: make sure -Wl,--gc-sections comes before -T in the linker options.	260	# Note: make sure -Wl,--gc-sections comes before -T in the linker options.
261	# Having the latter first caused crashes on (at least) mini2g.	261	# Having the latter first caused crashes on (at least) mini2g.
262	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM)	262	$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM)
263	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \	263	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -nostdlib -o $@ $(OBJ) \
264	-L$(BUILDDIR)/firmware \	264	-L$(BUILDDIR)/firmware \
265	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	265	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
266	-L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \	266	-L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
@@ -268,7 +268,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LI
268	-Wl,-Map,$(BUILDDIR)/rockbox.map	268	-Wl,-Map,$(BUILDDIR)/rockbox.map
269		269
270	$(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM)	270	$(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM)
271	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \	271	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -nostdlib -o $@ $(OBJ) \
272	-L$(BUILDDIR)/firmware \	272	-L$(BUILDDIR)/firmware \
273	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \	273	-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
274	-L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \	274	-L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \