From 2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 8 Jul 2021 20:46:11 -0400 Subject: build: Nuke the ASMFLAGS workaround for gcc 3.4.x Change-Id: I0f21e9539d39afd54916fa8d84ce798eef474a2c --- lib/rbcodec/codecs/codecs.make | 2 +- lib/rbcodec/codecs/libmad/libmad.make | 4 ++-- lib/rbcodec/codecs/libspeex/libspeex.make | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') 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 $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S $(SILENT)mkdir -p $(dir $@) $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ - -I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@ + -I$(dir $<) $(CODECFLAGS) -c $< -o $@ $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) $(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 $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S $(SILENT)mkdir -p $(dir $@) $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ - $(CC) $(MPEGMADFLAGS) $(ASMFLAGS) -c $< -o $@ + $(CC) $(MPEGMADFLAGS) -c $< -o $@ $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c $(SILENT)mkdir -p $(dir $@) @@ -55,4 +55,4 @@ $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S $(SILENT)mkdir -p $(dir $@) $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ - $(CC) $(MADFLAGS) $(ASMFLAGS) -c $< -o $@ + $(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 $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) $(ASMFLAGS) -c $< -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) -c $< -o $@ $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c $(SILENT)mkdir -p $(dir $@) @@ -53,4 +53,4 @@ $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) $(ASMFLAGS) -c $< -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) -c $< -o $@ -- cgit v1.2.3