Clang stuff and a fix.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12151 110e8d01-0319-4d1e-a829-52ad28d1bb01

3 files changed, 359 insertions, 43 deletions

diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk
index 77b7434b0..160731bdf 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk
@@ -79,13 +79,13 @@ OUTFILES := $(BUILDDIR)/$(PROJECT).elf \
             $(BUILDDIR)/$(PROJECT).hex \

             $(BUILDDIR)/$(PROJECT).bin \

             $(BUILDDIR)/$(PROJECT).dmp \

-            $(BUILDDIR)/$(PROJECT).list
-
-ifdef SREC
-  OUTFILES += $(BUILDDIR)/$(PROJECT).srec
-endif
-
-# Source files groups and paths
+            $(BUILDDIR)/$(PROJECT).list

+

+ifdef SREC

+  OUTFILES += $(BUILDDIR)/$(PROJECT).srec

+endif

+

+# Source files groups and paths

 TCSRC   += $(CSRC)

 TCPPSRC += $(CPPSRC)

 TSRC      := $(TCSRC) $(TCPPSRC)

@@ -105,7 +105,6 @@ OBJS      := $(ASMXOBJS) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)
 # Paths

 IINCDIR   := $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))

 LLIBDIR   := $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))

-LLIBDIR   += -L$(dir $(LDSCRIPT))

 

 # Macros

 DEFS      := $(DDEFS) $(UDEFS)

@@ -121,7 +120,13 @@ ASFLAGS   = $(MCFLAGS) $(OPT) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEF
 ASXFLAGS  = $(MCFLAGS) $(OPT) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS)

 CFLAGS    = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)

 CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)

-LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH)/ld,--script=$(LDSCRIPT)$(LDOPT)

+LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(STARTUPLD),--script=$(LDSCRIPT)$(LDOPT)

+

+# Always thumb mode

+CFLAGS   += -mthumb

+CPPFLAGS += -mthumb

+ASFLAGS  += -mthumb

+ASXFLAGS += -mthumb

 

 # Generate dependency information

 ASFLAGS  += -MD -MP -MF $(DEPDIR)/$(@F).d

@@ -194,37 +199,37 @@ ifeq ($(USE_VERBOSE_COMPILE),yes)
 	$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@

 else

 	@echo Compiling $(<F)

-	@$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
-endif
-
-$(BUILDDIR)/$(PROJECT).elf: $(OBJS) $(LDSCRIPT)
-ifeq ($(USE_VERBOSE_COMPILE),yes)
-	@echo
-	$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+	@$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@

+endif

+

+$(BUILDDIR)/$(PROJECT).elf: $(OBJS) $(LDSCRIPT)

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	@echo

+	$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@

 else

 	@echo Linking $@

-	@$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
-endif
-
-%.hex: %.elf
-ifeq ($(USE_VERBOSE_COMPILE),yes)
-	$(HEX) $< $@
-else
+	@$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@

+endif

+

+%.hex: %.elf

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	$(HEX) $< $@

+else

 	@echo Creating $@

-	@$(HEX) $< $@
-endif
-
-%.bin: %.elf
-ifeq ($(USE_VERBOSE_COMPILE),yes)
-	$(BIN) $< $@
-else
+	@$(HEX) $< $@

+endif

+

+%.bin: %.elf

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	$(BIN) $< $@

+else

 	@echo Creating $@

-	@$(BIN) $< $@
-endif
-
+	@$(BIN) $< $@

+endif

+

 %.srec: %.elf

 ifdef SREC

-  ifeq ($(USE_VERBOSE_COMPILE),yes)
+  ifeq ($(USE_VERBOSE_COMPILE),yes)

 	$(SREC) $< $@

   else

 	@echo Creating $@

@@ -234,19 +239,19 @@ endif
 

 %.dmp: %.elf

 ifeq ($(USE_VERBOSE_COMPILE),yes)

-	$(OD) $(ODFLAGS) $< > $@
-	$(SZ) $<
+	$(OD) $(ODFLAGS) $< > $@

+	$(SZ) $<

 else

 	@echo Creating $@

 	@$(OD) $(ODFLAGS) $< > $@

 	@echo

-	@$(SZ) $<
-endif
-
-%.list: %.elf
-ifeq ($(USE_VERBOSE_COMPILE),yes)
-	$(OD) -S $< > $@
-else
+	@$(SZ) $<

+endif

+

+%.list: %.elf

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	$(OD) -S $< > $@

+else

 	@echo Creating $@

 	@$(OD) -S $< > $@

 	@echo

diff --git a/os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk b/os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk
new file mode 100644
index 000000000..6959e59e3
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk
@@ -0,0 +1,22 @@
+##############################################################################

+# Compiler settings

+#

+

+TRGT = aarch32-

+CC   = clang

+CPPC = clang++

+# Enable loading with g++ only if you need C++ runtime support.

+# NOTE: You can use C++ even without C++ support if you are careful. C++

+#       runtime support makes code size explode.

+LD   = clang

+CP   = $(TRGT)objcopy

+AS   = clang -x assembler-with-cpp

+AR   = $(TRGT)ar

+OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

+HEX  = $(CP) -O ihex

+BIN  = $(CP) -O binary

+

+#

+# Compiler settings

+##############################################################################

diff --git a/os/common/startup/ARMCMx/compilers/LLVM/mk/rules.mk b/os/common/startup/ARMCMx/compilers/LLVM/mk/rules.mk
new file mode 100644
index 000000000..c584c39ff
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/LLVM/mk/rules.mk
@@ -0,0 +1,289 @@
+# ARM Cortex-Mx common makefile scripts and rules.

+

+##############################################################################

+# Processing options coming from the upper Makefile.

+#

+

+# Compiler options

+OPT    := $(USE_OPT)

+COPT   := $(USE_COPT)

+CPPOPT := $(USE_CPPOPT)

+

+# Garbage collection

+ifeq ($(USE_LINK_GC),yes)

+  OPT   += -ffunction-sections -fdata-sections -fno-common

+  LDOPT := ,--gc-sections

+else

+  LDOPT :=

+endif

+

+# Linker extra options

+ifneq ($(USE_LDOPT),)

+  LDOPT := $(LDOPT),$(USE_LDOPT)

+endif

+

+# Link time optimizations

+ifeq ($(USE_LTO),yes)

+  OPT += -flto

+endif

+

+# FPU options default (Cortex-M4 and Cortex-M7 single precision).

+ifeq ($(USE_FPU_OPT),)

+  USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv4-sp-d16

+endif

+

+# FPU-related options

+ifeq ($(USE_FPU),)

+  USE_FPU = no

+endif

+ifneq ($(USE_FPU),no)

+  OPT    += $(USE_FPU_OPT)

+  DDEFS  += -DCORTEX_USE_FPU=TRUE

+  DADEFS += -DCORTEX_USE_FPU=TRUE

+else

+  DDEFS  += -DCORTEX_USE_FPU=FALSE

+  DADEFS += -DCORTEX_USE_FPU=FALSE

+endif

+

+# Process stack size

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  LDOPT := $(LDOPT),--defsym=__process_stack_size__=0x400

+else

+  LDOPT := $(LDOPT),--defsym=__process_stack_size__=$(USE_PROCESS_STACKSIZE)

+endif

+

+# Exceptions stack size

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  LDOPT := $(LDOPT),--defsym=__main_stack_size__=0x400

+else

+  LDOPT := $(LDOPT),--defsym=__main_stack_size__=$(USE_EXCEPTIONS_STACKSIZE)

+endif

+

+# Output directory and files

+ifeq ($(BUILDDIR),)

+  BUILDDIR = build

+endif

+ifeq ($(BUILDDIR),.)

+  BUILDDIR = build

+endif

+

+# Dependencies directory

+ifeq ($(DEPDIR),)

+  DEPDIR = .dep

+endif

+ifeq ($(DEPDIR),.)

+  DEPDIR = .dep

+endif

+

+OUTFILES := $(BUILDDIR)/$(PROJECT).elf \

+            $(BUILDDIR)/$(PROJECT).hex \

+            $(BUILDDIR)/$(PROJECT).bin \

+            $(BUILDDIR)/$(PROJECT).dmp \

+            $(BUILDDIR)/$(PROJECT).list
+
+ifdef SREC
+  OUTFILES += $(BUILDDIR)/$(PROJECT).srec
+endif
+
+# Source files groups and paths
+TCSRC   += $(CSRC)

+TCPPSRC += $(CPPSRC)

+TSRC      := $(TCSRC) $(TCPPSRC)

+SRCPATHS  := $(sort $(dir $(ASMXSRC)) $(dir $(ASMSRC)) $(dir $(TSRC)))

+

+# Various directories

+OBJDIR    := $(BUILDDIR)/obj

+LSTDIR    := $(BUILDDIR)/lst

+

+# Object files groups

+TCOBJS    := $(addprefix $(OBJDIR)/, $(notdir $(TCSRC:.c=.o)))

+TCPPOBJS  := $(addprefix $(OBJDIR)/, $(notdir $(TCPPSRC:.cpp=.o)))

+ASMOBJS   := $(addprefix $(OBJDIR)/, $(notdir $(ASMSRC:.s=.o)))

+ASMXOBJS  := $(addprefix $(OBJDIR)/, $(notdir $(ASMXSRC:.S=.o)))

+OBJS      := $(ASMXOBJS) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)

+

+# Paths

+IINCDIR   := $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))

+LLIBDIR   := $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))

+

+# Macros

+DEFS      := $(DDEFS) $(UDEFS)

+ADEFS     := $(DADEFS) $(UADEFS)

+

+# Libs

+LIBS      := $(DLIBS) $(ULIBS)

+

+# Various settings

+MCFLAGS   := -mcpu=$(MCU)

+ODFLAGS   = -x --syms

+ASFLAGS   = $(MCFLAGS) $(OPT) $(ADEFS)

+ASXFLAGS  = $(MCFLAGS) $(OPT) $(ADEFS)

+CFLAGS    = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) $(DEFS)

+CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) $(DEFS)

+#ASFLAGS   = $(MCFLAGS) $(OPT) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)

+#ASXFLAGS  = $(MCFLAGS) $(OPT) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS)

+#CFLAGS    = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)

+#CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)

+LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(STARTUPLD),--script=$(LDSCRIPT)$(LDOPT)

+

+# Always thumb mode

+CFLAGS   += -mthumb

+CPPFLAGS += -mthumb

+ASFLAGS  += -mthumb

+ASXFLAGS += -mthumb

+

+# Generate dependency information

+ASFLAGS  += -MD -MP -MF $(DEPDIR)/$(@F).d

+ASXFLAGS += -MD -MP -MF $(DEPDIR)/$(@F).d

+CFLAGS   += -MD -MP -MF $(DEPDIR)/$(@F).d

+CPPFLAGS += -MD -MP -MF $(DEPDIR)/$(@F).d

+

+# Paths where to search for sources

+VPATH     = $(SRCPATHS)

+

+#

+# Makefile rules

+#

+

+all: PRE_MAKE_ALL_RULE_HOOK $(OBJS) $(OUTFILES) POST_MAKE_ALL_RULE_HOOK

+

+PRE_MAKE_ALL_RULE_HOOK:

+

+POST_MAKE_ALL_RULE_HOOK:

+

+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(DEPDIR)

+

+$(BUILDDIR):

+ifneq ($(USE_VERBOSE_COMPILE),yes)

+	@echo Compiler Options

+	@echo $(CC) -c $(CFLAGS) -I. $(IINCDIR) main.c -o main.o

+	@echo

+endif

+	@mkdir -p $(BUILDDIR)

+

+$(OBJDIR):

+	@mkdir -p $(OBJDIR)

+

+$(LSTDIR):

+	@mkdir -p $(LSTDIR)

+

+$(DEPDIR):

+	@mkdir -p $(DEPDIR)

+

+$(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	@echo

+	$(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@

+else

+	@echo Compiling $(<F)

+	@$(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@

+endif

+

+$(TCOBJS) : $(OBJDIR)/%.o : %.c $(MAKEFILE_LIST)

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	@echo

+	$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@

+else

+	@echo Compiling $(<F)

+	@$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@

+endif

+

+$(ASMOBJS) : $(OBJDIR)/%.o : %.s $(MAKEFILE_LIST)

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	@echo

+	$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@

+else

+	@echo Compiling $(<F)

+	@$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@

+endif

+

+$(ASMXOBJS) : $(OBJDIR)/%.o : %.S $(MAKEFILE_LIST)

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	@echo

+	$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@

+else

+	@echo Compiling $(<F)

+	@$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
+endif
+
+$(BUILDDIR)/$(PROJECT).elf: $(OBJS) $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
+	@echo
+	$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+else

+	@echo Linking $@

+	@$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+endif
+
+%.hex: %.elf
+ifeq ($(USE_VERBOSE_COMPILE),yes)
+	$(HEX) $< $@
+else
+	@echo Creating $@

+	@$(HEX) $< $@
+endif
+
+%.bin: %.elf
+ifeq ($(USE_VERBOSE_COMPILE),yes)
+	$(BIN) $< $@
+else
+	@echo Creating $@

+	@$(BIN) $< $@
+endif
+
+%.srec: %.elf

+ifdef SREC

+  ifeq ($(USE_VERBOSE_COMPILE),yes)
+	$(SREC) $< $@

+  else

+	@echo Creating $@

+	@$(SREC) $< $@

+  endif

+endif

+

+%.dmp: %.elf

+ifeq ($(USE_VERBOSE_COMPILE),yes)

+	$(OD) $(ODFLAGS) $< > $@
+	$(SZ) $<
+else

+	@echo Creating $@

+	@$(OD) $(ODFLAGS) $< > $@

+	@echo

+	@$(SZ) $<
+endif
+
+%.list: %.elf
+ifeq ($(USE_VERBOSE_COMPILE),yes)
+	$(OD) -S $< > $@
+else
+	@echo Creating $@

+	@$(OD) -S $< > $@

+	@echo

+	@echo Done

+endif

+

+lib: $(OBJS) $(BUILDDIR)/lib$(PROJECT).a

+

+$(BUILDDIR)/lib$(PROJECT).a: $(OBJS)

+	@$(AR) -r $@ $^

+	@echo

+	@echo Done

+

+clean: CLEAN_RULE_HOOK

+	@echo Cleaning

+	@echo - $(DEPDIR)

+	@-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

+	@-if [ -d "$(DEPDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) 2>/dev/null; fi

+	@echo - $(BUILDDIR)

+	@-if [ -d "$(BUILDDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null; fi

+	@echo

+	@echo Done

+

+CLEAN_RULE_HOOK:

+

+#

+# Include the dependency files, should be the last of the makefile

+#

+-include $(wildcard $(DEPDIR)/*)

+

+# *** EOF ***