diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2019-07-19 15:16:37 +0200 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2019-07-19 15:16:37 +0200 |
| commit | b0de98ad3b1391ec0dfe4f8eced0a6833490cd8f (patch) | |
| tree | fd5f2b9ca3b0825bb180e18f4396f77d41bc6da7 | |
| parent | 8bd992c5035bfee6aedbcae7669be5b823537aad (diff) | |
| download | rockbox-b0de98ad3b1391ec0dfe4f8eced0a6833490cd8f.tar.gz rockbox-b0de98ad3b1391ec0dfe4f8eced0a6833490cd8f.zip | |
Put -lfirmware in CORE_LIBS, to fix -thumb builds
For unknown reasons, -thumb builds need -lfirmware after -lrbcodec (but
still before -lunwarminder)i. Other builds are still happy if we do that.
Including it via CORE_LIBS instead of explicitly achieves that.
Change-Id: Id69e4a0c042f90f71cfd9a72202ce4d8ef6a4181
| -rw-r--r-- | firmware/firmware.make | 2 | ||||
| -rw-r--r-- | tools/root.make | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/firmware.make b/firmware/firmware.make index 3d79837871..6c01250bde 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make | |||
| @@ -52,6 +52,8 @@ $(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h | |||
| 52 | SVNVERSION:=$(shell VERSION='$(VERSION)' $(TOOLSDIR)/version.sh $(ROOTDIR)) | 52 | SVNVERSION:=$(shell VERSION='$(VERSION)' $(TOOLSDIR)/version.sh $(ROOTDIR)) |
| 53 | OLDSVNVERSION:=$(shell grep 'RBVERSION' $(BUILDDIR)/rbversion.h 2>/dev/null|cut -d '"' -f 2 || echo "NOREVISION") | 53 | OLDSVNVERSION:=$(shell grep 'RBVERSION' $(BUILDDIR)/rbversion.h 2>/dev/null|cut -d '"' -f 2 || echo "NOREVISION") |
| 54 | 54 | ||
| 55 | CORE_LIBS:=$(FIRMLIB) | ||
| 56 | |||
| 55 | ifneq ($(SVNVERSION),$(OLDSVNVERSION)) | 57 | ifneq ($(SVNVERSION),$(OLDSVNVERSION)) |
| 56 | .PHONY: $(BUILDDIR)/rbversion.h | 58 | .PHONY: $(BUILDDIR)/rbversion.h |
| 57 | endif | 59 | endif |
diff --git a/tools/root.make b/tools/root.make index 0075ed2137..ecab921c87 100644 --- a/tools/root.make +++ b/tools/root.make | |||
| @@ -247,7 +247,7 @@ $(LINKROM): $(ROMLDS) | |||
| 247 | # Having the latter first caused crashes on (at least) mini2g. | 247 | # Having the latter first caused crashes on (at least) mini2g. |
| 248 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM) | 248 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM) |
| 249 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 249 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
| 250 | -L$(BUILDDIR)/firmware -lfirmware \ | 250 | -L$(BUILDDIR)/firmware \ |
| 251 | -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ | 251 | -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ |
| 252 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ | 252 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ |
| 253 | -lgcc $(CORE_LDOPTS) -T$(LINKRAM) \ | 253 | -lgcc $(CORE_LDOPTS) -T$(LINKRAM) \ |
| @@ -255,7 +255,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LI | |||
| 255 | 255 | ||
| 256 | $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM) | 256 | $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM) |
| 257 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 257 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
| 258 | -L$(BUILDDIR)/firmware -lfirmware \ | 258 | -L$(BUILDDIR)/firmware \ |
| 259 | -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ | 259 | -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ |
| 260 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ | 260 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ |
| 261 | -lgcc $(CORE_LDOPTS) -T$(LINKROM) \ | 261 | -lgcc $(CORE_LDOPTS) -T$(LINKROM) \ |