diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-09-22 07:08:16 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-09-22 07:08:16 +0000 |
| commit | d3c129951cebb170827c3a9e2cdd9ce38d34f252 (patch) | |
| tree | d3b44a42d76a902a0e78fae8f93dbd10687d40a8 /os/common/startup/ARMCMx | |
| parent | 387c44dc6b8129f2e99cacccc8e48be602441d1a (diff) | |
| download | ChibiOS-d3c129951cebb170827c3a9e2cdd9ce38d34f252.tar.gz ChibiOS-d3c129951cebb170827c3a9e2cdd9ce38d34f252.tar.bz2 ChibiOS-d3c129951cebb170827c3a9e2cdd9ce38d34f252.zip | |
TABs cleanup.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10663 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common/startup/ARMCMx')
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/rules.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/rules.mk b/os/common/startup/ARMCMx/compilers/GCC/rules.mk index b204aec65..578a654de 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/rules.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/rules.mk @@ -108,7 +108,7 @@ 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)
+OBJS := $(ASMXOBJS) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)
# Paths
IINCDIR := $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))
@@ -117,14 +117,14 @@ LLIBDIR += -L$(dir $(LDSCRIPT)) # Macros
DEFS := $(DDEFS) $(UDEFS)
-ADEFS := $(DADEFS) $(UADEFS)
+ADEFS := $(DADEFS) $(UADEFS)
# Libs
LIBS := $(DLIBS) $(ULIBS)
# Various settings
MCFLAGS := -mcpu=$(MCU)
-ODFLAGS = -x --syms
+ODFLAGS = -x --syms
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)
|