diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2021-07-08 20:46:11 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2021-07-08 20:47:30 -0400 |
| commit | 2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d (patch) | |
| tree | 612e9d9a70ed50088ee643b7ea3bc6e0edae1ae2 /lib | |
| parent | 2c984f3714067a38980dae51d1cb7d66d49f84f8 (diff) | |
| download | rockbox-2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d.tar.gz rockbox-2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d.zip | |
build: Nuke the ASMFLAGS workaround for gcc 3.4.x
Change-Id: I0f21e9539d39afd54916fa8d84ce798eef474a2c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rbcodec/codecs/codecs.make | 2 | ||||
| -rw-r--r-- | lib/rbcodec/codecs/libmad/libmad.make | 4 | ||||
| -rw-r--r-- | lib/rbcodec/codecs/libspeex/libspeex.make | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make index 4f86db0d7d..f39c0b193f 100644 --- a/lib/rbcodec/codecs/codecs.make +++ b/lib/rbcodec/codecs/codecs.make | |||
| @@ -206,7 +206,7 @@ $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.c | |||
| 206 | $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S | 206 | $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S |
| 207 | $(SILENT)mkdir -p $(dir $@) | 207 | $(SILENT)mkdir -p $(dir $@) |
| 208 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ | 208 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ |
| 209 | -I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@ | 209 | -I$(dir $<) $(CODECFLAGS) -c $< -o $@ |
| 210 | 210 | ||
| 211 | $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) | 211 | $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) |
| 212 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \ | 212 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \ |
diff --git a/lib/rbcodec/codecs/libmad/libmad.make b/lib/rbcodec/codecs/libmad/libmad.make index fa6040d29a..6c50e1d201 100644 --- a/lib/rbcodec/codecs/libmad/libmad.make +++ b/lib/rbcodec/codecs/libmad/libmad.make | |||
| @@ -45,7 +45,7 @@ $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.c | |||
| 45 | $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S | 45 | $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S |
| 46 | $(SILENT)mkdir -p $(dir $@) | 46 | $(SILENT)mkdir -p $(dir $@) |
| 47 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | 47 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ |
| 48 | $(CC) $(MPEGMADFLAGS) $(ASMFLAGS) -c $< -o $@ | 48 | $(CC) $(MPEGMADFLAGS) -c $< -o $@ |
| 49 | 49 | ||
| 50 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c | 50 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c |
| 51 | $(SILENT)mkdir -p $(dir $@) | 51 | $(SILENT)mkdir -p $(dir $@) |
| @@ -55,4 +55,4 @@ $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c | |||
| 55 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S | 55 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S |
| 56 | $(SILENT)mkdir -p $(dir $@) | 56 | $(SILENT)mkdir -p $(dir $@) |
| 57 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | 57 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ |
| 58 | $(CC) $(MADFLAGS) $(ASMFLAGS) -c $< -o $@ | 58 | $(CC) $(MADFLAGS) -c $< -o $@ |
diff --git a/lib/rbcodec/codecs/libspeex/libspeex.make b/lib/rbcodec/codecs/libspeex/libspeex.make index c33fe1f9fa..9883c5d8fc 100644 --- a/lib/rbcodec/codecs/libspeex/libspeex.make +++ b/lib/rbcodec/codecs/libspeex/libspeex.make | |||
| @@ -45,7 +45,7 @@ $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.c | |||
| 45 | 45 | ||
| 46 | $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S | 46 | $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S |
| 47 | $(SILENT)mkdir -p $(dir $@) | 47 | $(SILENT)mkdir -p $(dir $@) |
| 48 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) $(ASMFLAGS) -c $< -o $@ | 48 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) -c $< -o $@ |
| 49 | 49 | ||
| 50 | $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c | 50 | $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c |
| 51 | $(SILENT)mkdir -p $(dir $@) | 51 | $(SILENT)mkdir -p $(dir $@) |
| @@ -53,4 +53,4 @@ $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c | |||
| 53 | 53 | ||
| 54 | $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S | 54 | $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S |
| 55 | $(SILENT)mkdir -p $(dir $@) | 55 | $(SILENT)mkdir -p $(dir $@) |
| 56 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) $(ASMFLAGS) -c $< -o $@ | 56 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) -c $< -o $@ |