tsiry-sandratraina.com / rockbox-zig
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
fork atom

build: Nuke the ASMFLAGS workaround for gcc 3.4.x

Change-Id: I0f21e9539d39afd54916fa8d84ce798eef474a2c

Solomon Peachy 2e9b93dc 2c984f37

+8 -9
unified split
+1 -1
lib/rbcodec/codecs/codecs.make
··· 206 $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S 207 $(SILENT)mkdir -p $(dir $@) 208 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ 209 - -I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@ 210 211 $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) 212 $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \
··· 206 $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S 207 $(SILENT)mkdir -p $(dir $@) 208 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ 209 + -I$(dir $<) $(CODECFLAGS) -c $< -o $@ 210 211 $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) 212 $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \
+2 -2
lib/rbcodec/codecs/libmad/libmad.make
··· 45 $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S 46 $(SILENT)mkdir -p $(dir $@) 47 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ 48 - $(CC) $(MPEGMADFLAGS) $(ASMFLAGS) -c $< -o $@ 49 50 $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c 51 $(SILENT)mkdir -p $(dir $@) ··· 55 $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S 56 $(SILENT)mkdir -p $(dir $@) 57 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ 58 - $(CC) $(MADFLAGS) $(ASMFLAGS) -c $< -o $@
··· 45 $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S 46 $(SILENT)mkdir -p $(dir $@) 47 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ 48 + $(CC) $(MPEGMADFLAGS) -c $< -o $@ 49 50 $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c 51 $(SILENT)mkdir -p $(dir $@) ··· 55 $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S 56 $(SILENT)mkdir -p $(dir $@) 57 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ 58 + $(CC) $(MADFLAGS) -c $< -o $@
+2 -2
lib/rbcodec/codecs/libspeex/libspeex.make
··· 45 46 $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S 47 $(SILENT)mkdir -p $(dir $@) 48 - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) $(ASMFLAGS) -c $< -o $@ 49 50 $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c 51 $(SILENT)mkdir -p $(dir $@) ··· 53 54 $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S 55 $(SILENT)mkdir -p $(dir $@) 56 - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) $(ASMFLAGS) -c $< -o $@
··· 45 46 $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S 47 $(SILENT)mkdir -p $(dir $@) 48 + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) -c $< -o $@ 49 50 $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c 51 $(SILENT)mkdir -p $(dir $@) ··· 53 54 $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S 55 $(SILENT)mkdir -p $(dir $@) 56 + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) -c $< -o $@
+1 -1
tools/make.inc
··· 11 12 $(OBJDIR)/%.o: %.S 13 $(SILENT)mkdir -p $(dir $@) 14 - $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ 15 16 # The echo stuff last in the dep update shell magic is to prevent any compiler 17 # errors/warnings to cause an error code to get returned and thus stop the
··· 11 12 $(OBJDIR)/%.o: %.S 13 $(SILENT)mkdir -p $(dir $@) 14 + $(call PRINTS,CC $<)$(CC) $(CFLAGS) -c $< -o $@ 15 16 # The echo stuff last in the dep update shell magic is to prevent any compiler 17 # errors/warnings to cause an error code to get returned and thus stop the
+2 -3
tools/root.make
··· 16 17 CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) 18 PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix 19 - ASMFLAGS = -D__ASSEMBLER__ # work around gcc 3.4.x bug with -std=gnu99, only meant for .S files 20 CORE_LDOPTS = $(GLOBAL_LDOPTS) # linker ops specifically for core build 21 22 TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ ··· 436 437 $(BUILDDIR)/%.o: $(ROOTDIR)/%.S 438 $(SILENT)mkdir -p $(dir $@) 439 - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ 440 441 # generated definitions for use in .S files 442 $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c ··· 451 452 %.o: %.S 453 $(SILENT)mkdir -p $(dir $@) 454 - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ 455 456 Makefile: $(TOOLSDIR)/configure 457 ifneq (reconf,$(MAKECMDGOALS))
··· 16 17 CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) 18 PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix 19 CORE_LDOPTS = $(GLOBAL_LDOPTS) # linker ops specifically for core build 20 21 TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ ··· 435 436 $(BUILDDIR)/%.o: $(ROOTDIR)/%.S 437 $(SILENT)mkdir -p $(dir $@) 438 + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ 439 440 # generated definitions for use in .S files 441 $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c ··· 450 451 %.o: %.S 452 $(SILENT)mkdir -p $(dir $@) 453 + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ 454 455 Makefile: $(TOOLSDIR)/configure 456 ifneq (reconf,$(MAKECMDGOALS))