From 2191bd3c4efb8baa682a3da0672065c24e7582dd Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 26 Feb 2014 08:54:48 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6725 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/common/ports/e200/compilers/GCC/rules.mk | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/os/common/ports/e200/compilers/GCC/rules.mk b/os/common/ports/e200/compilers/GCC/rules.mk index 26ad97945..e785857d9 100644 --- a/os/common/ports/e200/compilers/GCC/rules.mk +++ b/os/common/ports/e200/compilers/GCC/rules.mk @@ -1,6 +1,10 @@ -# PPC makefile scripts and rules. +# e200z common makefile scripts and rules. -# Automatic compiler options +############################################################################## +# Processing options coming from the upper Makefile. +# + +# Compiler options OPT = $(USE_OPT) COPT = $(USE_COPT) CPPOPT = $(USE_CPPOPT) @@ -69,15 +73,15 @@ ASMXOBJS = $(addprefix $(OBJDIR)/, $(notdir $(ASMXSRC:.S=.o))) OBJS = $(ASMXOBJS) $(ASMOBJS) $(COBJS) $(CPPOBJS) # Paths -IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR)) -LLIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) +IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR)) +LLIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) # Macros -DEFS = $(DDEFS) $(UDEFS) -ADEFS = $(DADEFS) $(UADEFS) +DEFS = $(DDEFS) $(UDEFS) +ADEFS = $(DADEFS) $(UADEFS) # Libs -LIBS = $(DLIBS) $(ULIBS) +LIBS = $(DLIBS) $(ULIBS) # Various settings MCFLAGS = -mcpu=$(MCU) @@ -86,7 +90,7 @@ ASFLAGS = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS) ASXFLAGS = $(MCFLAGS) -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),$(LDOPT),--script=$(LDSCRIPT) +LDFLAGS = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH),--script=$(LDSCRIPT),$(LDOPT) # Generate dependency information CFLAGS += -MD -MP -MF .dep/$(@F).d @@ -143,7 +147,7 @@ endif $(ASMXOBJS) : $(OBJDIR)/%.o : %.S Makefile ifeq ($(USE_VERBOSE_COMPILE),yes) - @echo + @echo $(CC) -c $(ASXFLAGS) -I. $(IINCDIR) $< -o $@ else @echo Compiling $(