mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 10:07:38 -04:00
Revert "Toolchains: Update to GCC 10.5.0"
I pushed the wrong working tree AGAIN
This reverts commit b92033f716
.
This commit is contained in:
parent
2c0bcc0be9
commit
e9b8413f49
13 changed files with 196 additions and 254 deletions
|
@ -26,13 +26,13 @@ IMGDECFLAGS = $(PLUGINFLAGS) -DIMGDEC
|
|||
IMGVSUBDIRS := $(call preprocess, $(IMGVSRCDIR)/SUBDIRS)
|
||||
$(foreach dir,$(IMGVSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make))
|
||||
|
||||
IMGDECLDFLAGS = $(GLOBAL_LDOPTS) -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(IMGVBUILDDIR)/$*.refmap
|
||||
IMGDECLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(IMGVBUILDDIR)/$*.refmap
|
||||
|
||||
ifndef APP_TYPE
|
||||
IMGDEC_OUTLDS = $(IMGVBUILDDIR)/%.link
|
||||
IMGDEC_OVLFLAGS = $(GLOBAL_LDOPTS) -T$(IMGVBUILDDIR)/$*.link -Wl,--gc-sections -Wl,-Map,$(IMGVBUILDDIR)/$*.map
|
||||
IMGDEC_OVLFLAGS = -T$(IMGVBUILDDIR)/$*.link -Wl,--gc-sections -Wl,-Map,$(IMGVBUILDDIR)/$*.map
|
||||
else
|
||||
IMGDEC_OVLFLAGS = $(GLOBAL_LDOPTS) $(PLUGINLDFLAGS) -Wl,$(LDMAP_OPT),$(IMGVBUILDDIR)/$*.map
|
||||
IMGDEC_OVLFLAGS = $(PLUGINLDFLAGS) -Wl,$(LDMAP_OPT),$(IMGVBUILDDIR)/$*.map
|
||||
endif
|
||||
|
||||
$(IMGVBUILDDIR)/%.ovl: $(IMGDEC_OUTLDS)
|
||||
|
@ -52,3 +52,4 @@ $(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUG
|
|||
$(IMGVBUILDDIR)/%.link: $(PLUGIN_LDS) $(IMGVBUILDDIR)/%.refmap
|
||||
$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DIMGVDECODER_OFFSET=$(shell \
|
||||
$(TOOLSDIR)/ovl_offset.pl $(IMGVBUILDDIR)/$*.refmap))
|
||||
|
||||
|
|
|
@ -149,7 +149,7 @@ ifdef APP_TYPE
|
|||
PLUGINFLAGS += $(SHARED_CFLAGS) # <-- from Makefile
|
||||
else
|
||||
PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map
|
||||
OVERLAYLDFLAGS = -T$(OVERLAYREF_LDS) -Wl,--gc-sections -Wl,-Map,$*.refmap $(GLOBAL_LDOPTS)
|
||||
OVERLAYLDFLAGS = -T$(OVERLAYREF_LDS) -Wl,--gc-sections -Wl,-Map,$*.refmap
|
||||
endif
|
||||
PLUGINLDFLAGS += $(GLOBAL_LDOPTS)
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ ifndef APP_TYPE
|
|||
WOLF3D_OUTLDS = $(SDL_OBJDIR)/wolf3d.link
|
||||
QUAKE_OUTLDS = $(SDL_OBJDIR)/quake.link
|
||||
|
||||
SDL_OVLFLAGS = -Wl,--gc-sections -Wl,-Map,$(basename $@).map $(GLOBAL_LDOPTS)
|
||||
SDL_OVLFLAGS = -Wl,--gc-sections -Wl,-Map,$(basename $@).map
|
||||
else
|
||||
### simulator
|
||||
ROCKS += $(SDL_OBJDIR)/duke3d.rock
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue