forked from len0rd/rockbox
Calculate the optimal memory location for overlay plugins, and use plugin.lds for linking them. This gets rid of hand-adjusted archos.lds, making it easy to use overlay plugins on other lowmem targets. * Fix some duplicate and incorrect dependencies. * Change the way libs are filtered, so that a lib can be specified more than once. This allows to get rid of explicitly linking gcc-support.o, fixing empty plugins on some simulator platforms.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20163 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
ce1c189d50
commit
c21e2e686f
11 changed files with 102 additions and 236 deletions
|
@ -17,20 +17,17 @@ OTHER_SRC += $(CHESSBOX_SRC)
|
|||
|
||||
ifndef SIMVER
|
||||
ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET)))))
|
||||
## archos recorder targets
|
||||
CHESSBOX_INLDS := $(CHESSBOX_SRCDIR)/archos.lds
|
||||
### lowmem targets
|
||||
ROCKS += $(CHESSBOX_OBJDIR)/chessbox.ovl
|
||||
CHESSBOX_OUTLDS = $(CHESSBOX_OBJDIR)/chessbox.link
|
||||
CHESSBOX_OVLFLAGS = -T$(CHESSBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
|
||||
else
|
||||
### all other targets
|
||||
CHESSBOX_INLDS := $(APPSDIR)/plugins/plugin.lds
|
||||
ROCKS += $(CHESSBOX_OBJDIR)/chessbox.rock
|
||||
endif
|
||||
CHESSBOX_OVLFLAGS = -T$(CHESSBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
|
||||
CHESSBOX_OUTLDS = $(CHESSBOX_OBJDIR)/chessbox.lds
|
||||
else
|
||||
### simulator
|
||||
ROCKS += $(CHESSBOX_OBJDIR)/chessbox.rock
|
||||
CHESSBOX_OVLFLAGS = $(SHARED_FLAG) # <-- from Makefile
|
||||
endif
|
||||
|
||||
ifeq ($(CPU),sh)
|
||||
|
@ -40,15 +37,18 @@ else
|
|||
CHESSBOXFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O2
|
||||
endif
|
||||
|
||||
$(CHESSBOX_OUTLDS): $(CHESSBOX_INLDS) $(CHESSBOX_OBJ)
|
||||
$(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@)
|
||||
$(CHESSBOX_OBJDIR)/chessbox.rock: $(CHESSBOX_OBJ)
|
||||
|
||||
$(CHESSBOX_OBJDIR)/chessbox.rock: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS) $(PLUGINBITMAPLIB)
|
||||
$(CHESSBOX_OBJDIR)/chessbox.refmap: $(CHESSBOX_OBJ)
|
||||
|
||||
$(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS) $(PLUGINBITMAPLIB)
|
||||
$(CHESSBOX_OUTLDS): $(PLUGIN_LDS) $(CHESSBOX_OBJDIR)/chessbox.refmap
|
||||
$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DOVERLAY_OFFSET=$(shell \
|
||||
$(TOOLSDIR)/ovl_offset.pl $(CHESSBOX_OBJDIR)/chessbox.refmap))
|
||||
|
||||
$(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS)
|
||||
$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
|
||||
$(filter %.o, $^) \
|
||||
$(filter %.a, $^) \
|
||||
$(filter %.a, $+) \
|
||||
-lgcc $(CHESSBOX_OVLFLAGS)
|
||||
$(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue