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 | |
parent | 6cbacb1b3eef1ea9c2f1c9ef58795421912cfb90 (diff) | |
download | rockbox-0bf1bd1d51750bf9eb0b3e149452dc1c3a89166c.tar.gz rockbox-0bf1bd1d51750bf9eb0b3e149452dc1c3a89166c.zip |
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
-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 | ||||
-rw-r--r-- | firmware/test/kernel/Makefile | 2 | ||||
-rw-r--r-- | tools/make.inc | 2 | ||||
-rw-r--r-- | tools/root.make | 5 |
8 files changed, 11 insertions, 15 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 | |||
109 | $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S | 109 | $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S |
110 | $(SILENT)mkdir -p $(dir $@) | 110 | $(SILENT)mkdir -p $(dir $@) |
111 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ | 111 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ |
112 | -I$(dir $<) $(CODECFLAGS) -c $< -o $@ | 112 | -I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@ |
113 | 113 | ||
114 | ifdef APP_TYPE | 114 | ifdef APP_TYPE |
115 | CODECLDFLAGS = $(SHARED_FLAG) # <-- from Makefile | 115 | 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 | |||
24 | 24 | ||
25 | */ | 25 | */ |
26 | 26 | ||
27 | /* workaround gcc 3.4.6 -std=gnu99 */ | ||
28 | #ifndef __ASSEMBLER__ | ||
29 | #define __ASSEMBLER__ | ||
30 | #endif | ||
31 | |||
32 | #include "demac_config.h" | 27 | #include "demac_config.h" |
33 | 28 | ||
34 | /* NOTE: The following need to be kept in sync with parser.h */ | 29 | /* 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 | |||
53 | $(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.S | 53 | $(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.S |
54 | $(SILENT)mkdir -p $(dir $@) | 54 | $(SILENT)mkdir -p $(dir $@) |
55 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | 55 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ |
56 | $(CC) $(MPEGMADFLAGS) -c $< -o $@ | 56 | $(CC) $(MPEGMADFLAGS) $(ASMFLAGS) -c $< -o $@ |
57 | 57 | ||
58 | $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.c | 58 | $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.c |
59 | $(SILENT)mkdir -p $(dir $@) | 59 | $(SILENT)mkdir -p $(dir $@) |
@@ -63,4 +63,4 @@ $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.c | |||
63 | $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.S | 63 | $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.S |
64 | $(SILENT)mkdir -p $(dir $@) | 64 | $(SILENT)mkdir -p $(dir $@) |
65 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | 65 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ |
66 | $(CC) $(MADFLAGS) -c $< -o $@ | 66 | $(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 | |||
52 | 52 | ||
53 | $(CODECDIR)/libspeex-voice/%.o : $(ROOTDIR)/apps/codecs/libspeex/%.S | 53 | $(CODECDIR)/libspeex-voice/%.o : $(ROOTDIR)/apps/codecs/libspeex/%.S |
54 | $(SILENT)mkdir -p $(dir $@) | 54 | $(SILENT)mkdir -p $(dir $@) |
55 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) -c $< -o $@ | 55 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) $(ASMFLAGS) -c $< -o $@ |
56 | 56 | ||
57 | $(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.c | 57 | $(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.c |
58 | $(SILENT)mkdir -p $(dir $@) | 58 | $(SILENT)mkdir -p $(dir $@) |
@@ -60,4 +60,4 @@ $(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.c | |||
60 | 60 | ||
61 | $(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.S | 61 | $(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.S |
62 | $(SILENT)mkdir -p $(dir $@) | 62 | $(SILENT)mkdir -p $(dir $@) |
63 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) -c $< -o $@ | 63 | $(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 | |||
31 | 31 | ||
32 | $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.S | 32 | $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.S |
33 | $(SILENT)mkdir -p $(dir $@) | 33 | $(SILENT)mkdir -p $(dir $@) |
34 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TTAFLAGS) -c $< -o $@ | 34 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TTAFLAGS) $(ASMFLAGS) -c $< -o $@ |
diff --git a/firmware/test/kernel/Makefile b/firmware/test/kernel/Makefile index be82abfcb9..94171767c6 100644 --- a/firmware/test/kernel/Makefile +++ b/firmware/test/kernel/Makefile | |||
@@ -19,7 +19,7 @@ OBJS= ../../crt0.o ../../system.o main.o ../../panic.o ../../drivers/lcd.o \ | |||
19 | ../../debug.o ../../common/sprintf.o | 19 | ../../debug.o ../../common/sprintf.o |
20 | 20 | ||
21 | %.o: %.S | 21 | %.o: %.S |
22 | $(CC) -o $@ $(CFLAGS) $(INCLUDES) $(DEFS) -c $< | 22 | $(CC) -o $@ $(CFLAGS) $(INCLUDES) $(DEFS) $(ASMFLAGS) -c $< |
23 | 23 | ||
24 | 24 | ||
25 | all : archos.mod | 25 | all : archos.mod |
diff --git a/tools/make.inc b/tools/make.inc index 5521612f62..d03898b2e1 100644 --- a/tools/make.inc +++ b/tools/make.inc | |||
@@ -11,7 +11,7 @@ $(OBJDIR)/%.o: %.c | |||
11 | 11 | ||
12 | $(OBJDIR)/%.o: %.S | 12 | $(OBJDIR)/%.o: %.S |
13 | $(SILENT)mkdir -p $(dir $@) | 13 | $(SILENT)mkdir -p $(dir $@) |
14 | $(call PRINTS,CC $<)$(CC) $(CFLAGS) -c $< -o $@ | 14 | $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ |
15 | 15 | ||
16 | # The echo stuff last in the dep update shell magic is to prevent any compiler | 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 | 17 | # errors/warnings to cause an error code to get returned and thus stop the |
diff --git a/tools/root.make b/tools/root.make index 401599aeb5..885a80d2c6 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -16,6 +16,7 @@ INCLUDES = -I$(BUILDDIR) -I$(BUILDDIR)/lang $(TARGET_INC) | |||
16 | 16 | ||
17 | CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) | 17 | CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) |
18 | PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix | 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 | ||
19 | 20 | ||
20 | TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ | 21 | TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ |
21 | $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ | 22 | $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ |
@@ -343,7 +344,7 @@ $(BUILDDIR)/%.o: $(ROOTDIR)/%.c | |||
343 | 344 | ||
344 | $(BUILDDIR)/%.o: $(ROOTDIR)/%.S | 345 | $(BUILDDIR)/%.o: $(ROOTDIR)/%.S |
345 | $(SILENT)mkdir -p $(dir $@) | 346 | $(SILENT)mkdir -p $(dir $@) |
346 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ | 347 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ |
347 | 348 | ||
348 | # generated definitions for use in .S files | 349 | # generated definitions for use in .S files |
349 | $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c | 350 | $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c |
@@ -358,7 +359,7 @@ $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c | |||
358 | 359 | ||
359 | %.o: %.S | 360 | %.o: %.S |
360 | $(SILENT)mkdir -p $(dir $@) | 361 | $(SILENT)mkdir -p $(dir $@) |
361 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ | 362 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ |
362 | 363 | ||
363 | Makefile: $(TOOLSDIR)/configure | 364 | Makefile: $(TOOLSDIR)/configure |
364 | ifneq (reconf,$(MAKECMDGOALS)) | 365 | ifneq (reconf,$(MAKECMDGOALS)) |