diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-13 19:02:27 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-13 19:02:27 -0400 |
| commit | e2adc6781fded00884ddb0161eb0f53b967f4785 (patch) | |
| tree | 701bc69559ae4d933137549b99ce355afee33cc3 | |
| parent | 09785a8499b601abc9eac7640060c12eba962b56 (diff) | |
| download | rockbox-e2adc6781fded00884ddb0161eb0f53b967f4785.tar.gz rockbox-e2adc6781fded00884ddb0161eb0f53b967f4785.zip | |
bootloader: Work around linker wonkiness that broke PP bootloader builds.
Change-Id: I8e32c1605c0844c6f1980919ede61ca674b00bbb
| -rw-r--r-- | bootloader/bootloader.make | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make index 75ad082f84..25c49da011 100644 --- a/bootloader/bootloader.make +++ b/bootloader/bootloader.make | |||
| @@ -16,6 +16,9 @@ BOOTLINK := $(BUILDDIR)/boot.link | |||
| 16 | 16 | ||
| 17 | CLEANOBJS += $(BUILDDIR)/bootloader.* | 17 | CLEANOBJS += $(BUILDDIR)/bootloader.* |
| 18 | 18 | ||
| 19 | # FIXME: PP arm targets need this, otherwise we can't find __div0 | ||
| 20 | EXTRA_SPECIAL_LIBS = $(call a2lnk, $(CORE_LIBS)) | ||
| 21 | |||
| 19 | .SECONDEXPANSION: | 22 | .SECONDEXPANSION: |
| 20 | 23 | ||
| 21 | $(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) | 24 | $(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) |
| @@ -25,7 +28,7 @@ $(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) | |||
| 25 | $(BUILDDIR)/bootloader.elf: $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $$(BOOTLINK) | 28 | $(BUILDDIR)/bootloader.elf: $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $$(BOOTLINK) |
| 26 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 29 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
| 27 | -L$(BUILDDIR)/firmware -lfirmware \ | 30 | -L$(BUILDDIR)/firmware -lfirmware \ |
| 28 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ | 31 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) $(EXTRA_SPECIAL_LIBS) \ |
| 29 | -lgcc -T$(BOOTLINK) $(GLOBAL_LDOPTS) \ | 32 | -lgcc -T$(BOOTLINK) $(GLOBAL_LDOPTS) \ |
| 30 | -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map | 33 | -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map |
| 31 | 34 | ||