diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-06-16 11:20:01 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-06-16 11:20:01 +0000 |
| commit | 1011f0300e0bd43b953b4dae0e96e47386c4e467 (patch) | |
| tree | 36d7c5049236235c352a6957707cd42617c25e85 /os/common/startup/ARMCMx/compilers/GCC | |
| parent | b5c1568431d724a1d15476bbc7ac0ae62435b6fc (diff) | |
| download | ChibiOS-1011f0300e0bd43b953b4dae0e96e47386c4e467.tar.gz ChibiOS-1011f0300e0bd43b953b4dae0e96e47386c4e467.tar.bz2 ChibiOS-1011f0300e0bd43b953b4dae0e96e47386c4e467.zip | |
Rules.mk small fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9630 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common/startup/ARMCMx/compilers/GCC')
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/rules.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/rules.mk b/os/common/startup/ARMCMx/compilers/GCC/rules.mk index 4ea7768ec..9c4aeaaac 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/rules.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/rules.mk @@ -79,8 +79,8 @@ else ACSRC += $(CSRC)
ACPPSRC += $(CPPSRC)
endif
-ASRC := $(ACSRC)$(ACPPSRC)
-TSRC := $(TCSRC)$(TCPPSRC)
+ASRC := $(ACSRC) $(ACPPSRC)
+TSRC := $(TCSRC) $(TCPPSRC)
SRCPATHS := $(sort $(dir $(ASMXSRC)) $(dir $(ASMSRC)) $(dir $(ASRC)) $(dir $(TSRC)))
# Various directories
@@ -118,11 +118,11 @@ CPPFLAGS = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir LDFLAGS = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH)/ld,--script=$(LDSCRIPT)$(LDOPT)
# Thumb interwork enabled only if needed because it kills performance.
-ifneq ($(TSRC),)
+ifneq ($(strip $(TSRC)),)
CFLAGS += -DTHUMB_PRESENT
CPPFLAGS += -DTHUMB_PRESENT
ASFLAGS += -DTHUMB_PRESENT
- ifneq ($(ASRC),)
+ ifneq ($(strip $(ASRC)),)
# Mixed ARM and THUMB mode.
CFLAGS += -mthumb-interwork
CPPFLAGS += -mthumb-interwork
|