summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-05-24 16:20:49 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-05-24 16:20:49 +0000
commita057e5cce9e306f706c7eeb574edf91b6f0e7ec9 (patch)
tree092fd19b4d6c371b21129c7e0de901489d6ff3b2
parent13f8775f7220738a807ab02c492095ef4179d77f (diff)
downloadrockbox-a057e5cce9e306f706c7eeb574edf91b6f0e7ec9.tar.gz
rockbox-a057e5cce9e306f706c7eeb574edf91b6f0e7ec9.zip
.S files should be compiled with gcc, not gas
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@706 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index a95481cb3f..d1a3ebf5f2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -31,8 +31,6 @@ else
31CFLAGS += -fomit-frame-pointer -fschedule-insns 31CFLAGS += -fomit-frame-pointer -fschedule-insns
32endif 32endif
33 33
34AFLAGS += -small -relax
35
36SRC := $(wildcard drivers/*.c common/*.c malloc/*.c *.c) 34SRC := $(wildcard drivers/*.c common/*.c malloc/*.c *.c)
37 35
38OBJS := $(SRC:%.c=$(OBJDIR)/%.o) $(OBJDIR)/crt0.o 36OBJS := $(SRC:%.c=$(OBJDIR)/%.o) $(OBJDIR)/crt0.o
@@ -48,6 +46,10 @@ $(OBJDIR)/%.o: %.c
48 @mkdir -p `dirname $@` 46 @mkdir -p `dirname $@`
49 $(CC) $(CFLAGS) -c $< -o $@ 47 $(CC) $(CFLAGS) -c $< -o $@
50 48
49$(OBJDIR)/%.o: %.S
50 @mkdir -p `dirname $@`
51 $(CC) $(CFLAGS) -c $< -o $@
52
51clean: 53clean:
52 rm -f $(OBJS) $(OUTPUT) 54 rm -f $(OBJS) $(OUTPUT)
53 rm -rf $(OBJDIR)/$(DEPS) 55 rm -rf $(OBJDIR)/$(DEPS)
@@ -56,9 +58,6 @@ clean:
56$(OBJDIR)/thread.o: thread.c thread.h 58$(OBJDIR)/thread.o: thread.c thread.h
57 $(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ 59 $(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@
58 60
59$(OBJDIR)/crt0.o: crt0.S
60 $(AS) $(AFLAGS) -o $@ $<
61
62$(OBJDIR)/$(DEPS)/%.d: %.c 61$(OBJDIR)/$(DEPS)/%.d: %.c
63 @$(SHELL) -c 'for d in $(DEPDIRS); do { if [ ! -d $(OBJDIR)/$$d ]; then mkdir $(OBJDIR)/$$d; fi; }; done' 62 @$(SHELL) -c 'for d in $(DEPDIRS); do { if [ ! -d $(OBJDIR)/$$d ]; then mkdir $(OBJDIR)/$$d; fi; }; done'
64 @echo "Updating dependencies for $<" 63 @echo "Updating dependencies for $<"