diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-12-27 17:27:59 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-12-27 17:27:59 +0000 |
| commit | 0bf1bd1d51750bf9eb0b3e149452dc1c3a89166c (patch) | |
| tree | ddc94b863dda316e420f72673e3a86a3732965c8 /apps/codecs | |
| parent | 6cbacb1b3eef1ea9c2f1c9ef58795421912cfb90 (diff) | |
| download | rockbox-0bf1bd1d51750bf9eb0b3e149452dc1c3a89166c.zip rockbox-0bf1bd1d51750bf9eb0b3e149452dc1c3a89166c.tar.gz rockbox-0bf1bd1d51750bf9eb0b3e149452dc1c3a89166c.tar.bz2 rockbox-0bf1bd1d51750bf9eb0b3e149452dc1c3a89166c.tar.xz | |
Redo r28026 so that all .S files get the __ASSEMBLER__ define.
Patch by Thomas Jarosch.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28913 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
| -rw-r--r-- | apps/codecs/codecs.make | 2 | ||||
| -rw-r--r-- | apps/codecs/demac/libdemac/predictor-cf.S | 5 | ||||
| -rw-r--r-- | apps/codecs/libmad/libmad.make | 4 | ||||
| -rw-r--r-- | apps/codecs/libspeex/libspeex.make | 4 | ||||
| -rw-r--r-- | apps/codecs/libtta/libtta.make | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 30fea99..be1a0e0 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 1617f9a..fc1d901 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 58d2dc8..f8423b8 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 e25ea64..ee93e71 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 b18d013..d458ab7 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 $@ |