5 files changed, 6 insertions, 11 deletions

diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index 30fea9969e..be1a0e0f00 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -109,7 +109,7 @@ $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.c
 $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
-                -I$(dir $<) $(CODECFLAGS) -c $< -o $@
+                -I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@
 
 ifdef APP_TYPE
  CODECLDFLAGS = $(SHARED_FLAG) # <-- from Makefile
diff --git a/apps/codecs/demac/libdemac/predictor-cf.S b/apps/codecs/demac/libdemac/predictor-cf.S
index 1617f9aa9c..fc1d901a59 100644
--- a/apps/codecs/demac/libdemac/predictor-cf.S
+++ b/apps/codecs/demac/libdemac/predictor-cf.S
@@ -24,11 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
 
 */
 
-/* workaround gcc 3.4.6 -std=gnu99 */
-#ifndef __ASSEMBLER__
-#define __ASSEMBLER__
-#endif
-
 #include "demac_config.h"
 
 /* NOTE: The following need to be kept in sync with parser.h */
diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make
index 58d2dc84e6..f8423b88fe 100644
--- a/apps/codecs/libmad/libmad.make
+++ b/apps/codecs/libmad/libmad.make
@@ -53,7 +53,7 @@ $(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.c
 $(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.S
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
-                $(CC) $(MPEGMADFLAGS) -c $< -o $@
+                $(CC) $(MPEGMADFLAGS) $(ASMFLAGS) -c $< -o $@
 
 $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.c
         $(SILENT)mkdir -p $(dir $@)
@@ -63,4 +63,4 @@ $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.c
 $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.S
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
-                $(CC) $(MADFLAGS) -c $< -o $@
+                $(CC) $(MADFLAGS) $(ASMFLAGS) -c $< -o $@
diff --git a/apps/codecs/libspeex/libspeex.make b/apps/codecs/libspeex/libspeex.make
index e25ea646c5..ee93e7113d 100644
--- a/apps/codecs/libspeex/libspeex.make
+++ b/apps/codecs/libspeex/libspeex.make
@@ -52,7 +52,7 @@ $(CODECDIR)/libspeex-voice/%.o : $(ROOTDIR)/apps/codecs/libspeex/%.c
 
 $(CODECDIR)/libspeex-voice/%.o : $(ROOTDIR)/apps/codecs/libspeex/%.S
         $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) -c $< -o $@
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) $(ASMFLAGS) -c $< -o $@
 
 $(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.c
         $(SILENT)mkdir -p $(dir $@)
@@ -60,4 +60,4 @@ $(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.c
 
 $(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.S
         $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) -c $< -o $@
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) $(ASMFLAGS) -c $< -o $@
diff --git a/apps/codecs/libtta/libtta.make b/apps/codecs/libtta/libtta.make
index b18d013cbf..d458ab78bc 100644
--- a/apps/codecs/libtta/libtta.make
+++ b/apps/codecs/libtta/libtta.make
@@ -31,4 +31,4 @@ $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.c
 
 $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.S
         $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TTAFLAGS) -c $< -o $@
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TTAFLAGS) $(ASMFLAGS) -c $< -o $@