m-labs · May 31, 2012 · May 31, 2012 · May 31, 2012 · May 31, 2012
Showing with 31 additions and 37 deletions.

+3 −0 software/bios/Makefile

+19 −21 software/common.mak

+0 −16 software/compiler-rt/lm32.mk

+6 −0 software/include/base/stdio.h

+3 −0 software/libbase/Makefile
diff --git a/software/bios/Makefile b/software/bios/Makefile
@@ -24,6 +24,9 @@ bios-rescue.elf: linker-rescue.ld $(OBJECTS) libs
 		-lbase -lcompiler_rt
 	chmod -x $@
 
+%.o: %.c
+	$(compile-dep)
+
 libs:
 	make -C $(M2DIR)/software/libbase
 

diff --git a/software/common.mak b/software/common.mak
@@ -1,20 +1,17 @@
-# Mico32 toolchain
-#
-CROSS_COMPILER=lm32-elf-
-# TODO: mico32 should be renamed lm32 in LLVM
-CLANG=clang -ccc-host-triple mico32-elf
+TARGET_PREFIX=lm32-elf
+CLANG=clang -ccc-host-triple $(TARGET_PREFIX)
 
 CC_normal := $(CLANG)
-AR_normal := $(CROSS_COMPILER)ar
-LD_normal := $(CROSS_COMPILER)ld
-OBJCOPY_normal := $(CROSS_COMPILER)objcopy
-RANLIB_normal := $(CROSS_COMPILER)ranlib
+AR_normal := $(TARGET_PREFIX)-ar
+LD_normal := $(TARGET_PREFIX)-ld
+OBJCOPY_normal := $(TARGET_PREFIX)-objcopy
+RANLIB_normal := $(TARGET_PREFIX)-ranlib
 
 CC_quiet = @echo " CC " $@ && $(CLANG)
-AR_quiet = @echo " AR " $@ && $(CROSS_COMPILER)ar
-LD_quiet = @echo " LD " $@ && $(CROSS_COMPILER)ld
-OBJCOPY_quiet = @echo " OBJCOPY " $@ && $(CROSS_COMPILER)objcopy
-RANLIB_quiet = @echo " RANLIB  " $@ && $(CROSS_COMPILER)ranlib
+AR_quiet = @echo " AR " $@ && $(TARGET_PREFIX)-ar
+LD_quiet = @echo " LD " $@ && $(TARGET_PREFIX)-ld
+OBJCOPY_quiet = @echo " OBJCOPY " $@ && $(TARGET_PREFIX)-objcopy
+RANLIB_quiet = @echo " RANLIB  " $@ && $(TARGET_PREFIX)-ranlib
 
 ifeq ($(V),1)
     CC = $(CC_normal)
@@ -40,11 +37,12 @@ LDFLAGS = -nostdlib -nodefaultlibs
 # compile and generate dependencies, based on
 # http://scottmcpeak.com/autodepend/autodepend.html
 
-%.o: $(SRCDIR)%.c
-	$(CC) -c $(CFLAGS) $(SRCDIR)$*.c -o $*.o
-	@$(CC_normal) -MM $(CFLAGS) $(SRCDIR)$*.c > $*.d
-	@mv -f $*.d $*.d.tmp
-	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
-	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
-	  sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
-	@rm -f $*.d.tmp
+define compile-dep =
+$(CC) -c $(CFLAGS) $< -o $*.o
+@$(CC_normal) -MM $(CFLAGS) $< > $*.d
+@mv -f $*.d $*.d.tmp
+@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+	sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+@rm -f $*.d.tmp
+endef
diff --git a/software/compiler-rt/lm32.mk b/software/compiler-rt/lm32.mk
diff --git a/software/include/base/stdio.h b/software/include/base/stdio.h
@@ -12,6 +12,12 @@ int sprintf(char *buf, const char *fmt, ...);
 
 int printf(const char *fmt, ...);
 
+/* Not sure this belongs here... */
+typedef long long loff_t;
+typedef long off_t;
+typedef int mode_t;
+typedef int dev_t;
+
 /*
  * Note: this library does not provide FILE operations.
  * User code must implement them.

diff --git a/software/libbase/Makefile b/software/libbase/Makefile
@@ -12,6 +12,9 @@ libbase.a: $(OBJECTS)
 	$(AR) clr libbase.a $(OBJECTS)
 	$(RANLIB) libbase.a
 
+%.o: %.c
+	$(compile-dep)
+
 .PHONY: clean
 
 clean: