From e18447d166dd82c995154e906123e229d164b3af Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Tue, 29 May 2012 16:39:47 +0200
Subject: [PATCH] software/common.mak: use clang + lm32-elf binutils only

---
 software/common.mak | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/software/common.mak b/software/common.mak
index 2b238a513..4f2b89eee 100644
--- a/software/common.mak
+++ b/software/common.mak
@@ -1,18 +1,17 @@
 # Mico32 toolchain
 #
-CROSS_COMPILER=lm32-rtems4.11-
-CLANG=clang -ccc-host-triple mico32-generic-generic -ccc-gcc-name $(CROSS_COMPILER)gcc
+CROSS_COMPILER=lm32-elf-
+# TODO: mico32 should be renamed lm32 in LLVM
+CLANG=clang -ccc-host-triple mico32-elf
 
 CC_normal := $(CLANG)
 AR_normal := $(CROSS_COMPILER)ar
-AS_normal := $(CROSS_COMPILER)as
 LD_normal := $(CROSS_COMPILER)ld
 OBJCOPY_normal := $(CROSS_COMPILER)objcopy
 RANLIB_normal := $(CROSS_COMPILER)ranlib
 
 CC_quiet = @echo " CC " $@ && $(CLANG)
 AR_quiet = @echo " AR " $@ && $(CROSS_COMPILER)ar
-AS_quiet = @echo " AS " $@ && $(CROSS_COMPILER)as
 LD_quiet = @echo " LD " $@ && $(CROSS_COMPILER)ld
 OBJCOPY_quiet = @echo " OBJCOPY " $@ && $(CROSS_COMPILER)objcopy
 RANLIB_quiet = @echo " RANLIB  " $@ && $(CROSS_COMPILER)ranlib
@@ -20,14 +19,12 @@ RANLIB_quiet = @echo " RANLIB  " $@ && $(CROSS_COMPILER)ranlib
 ifeq ($(V),1)
     CC = $(CC_normal)
     AR = $(AR_normal)
-    AS = $(AS_normal)
     LD = $(LD_normal)
     OBJCOPY = $(OBJCOPY_normal)
     RANLIB = $(RANLIB_normal)
 else
     CC = $(CC_quiet)
     AR = $(AR_quiet)
-    AS = $(AS_quiet)
     LD = $(LD_quiet)
     OBJCOPY = $(OBJCOPY_quiet)
     RANLIB = $(RANLIB_quiet)
@@ -36,7 +33,6 @@ endif
 # Toolchain options
 #
 INCLUDES = -I$(M2DIR)/software/include/base -I$(M2DIR)/software/include -I$(M2DIR)/common
-ASFLAGS = -nostdinc $(INCLUDES)
 CFLAGS = -O9 -Wall -Wstrict-prototypes -Wold-style-definition -Wshadow \
 	 -Wmissing-prototypes -fsigned-char -nostdinc $(INCLUDES)
 LDFLAGS = -nostdlib -nodefaultlibs