Fixed bug #787.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9883 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
330d539942
commit
6a3e9bfe0b
|
@ -131,17 +131,20 @@ ifneq ($(strip $(TSRC)),)
|
||||||
CFLAGS += -DTHUMB_PRESENT
|
CFLAGS += -DTHUMB_PRESENT
|
||||||
CPPFLAGS += -DTHUMB_PRESENT
|
CPPFLAGS += -DTHUMB_PRESENT
|
||||||
ASFLAGS += -DTHUMB_PRESENT
|
ASFLAGS += -DTHUMB_PRESENT
|
||||||
|
ASXFLAGS += -DTHUMB_PRESENT
|
||||||
ifneq ($(strip $(ASRC)),)
|
ifneq ($(strip $(ASRC)),)
|
||||||
# Mixed ARM and THUMB mode.
|
# Mixed ARM and THUMB mode.
|
||||||
CFLAGS += -mthumb-interwork
|
CFLAGS += -mthumb-interwork
|
||||||
CPPFLAGS += -mthumb-interwork
|
CPPFLAGS += -mthumb-interwork
|
||||||
ASFLAGS += -mthumb-interwork
|
ASFLAGS += -mthumb-interwork
|
||||||
|
ASXFLAGS += -mthumb-interwork
|
||||||
LDFLAGS += -mthumb-interwork
|
LDFLAGS += -mthumb-interwork
|
||||||
else
|
else
|
||||||
# Pure THUMB mode, THUMB C code cannot be called by ARM asm code directly.
|
# Pure THUMB mode, THUMB C code cannot be called by ARM asm code directly.
|
||||||
CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
|
CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
|
||||||
CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
|
CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
|
||||||
ASFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
|
ASFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
|
||||||
|
ASXFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
|
||||||
LDFLAGS += -mno-thumb-interwork -mthumb
|
LDFLAGS += -mno-thumb-interwork -mthumb
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
|
@ -149,11 +152,13 @@ else
|
||||||
CFLAGS += -mno-thumb-interwork
|
CFLAGS += -mno-thumb-interwork
|
||||||
CPPFLAGS += -mno-thumb-interwork
|
CPPFLAGS += -mno-thumb-interwork
|
||||||
ASFLAGS += -mno-thumb-interwork
|
ASFLAGS += -mno-thumb-interwork
|
||||||
|
ASXFLAGS += -mno-thumb-interwork
|
||||||
LDFLAGS += -mno-thumb-interwork
|
LDFLAGS += -mno-thumb-interwork
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Generate dependency information
|
# Generate dependency information
|
||||||
ASFLAGS += -MD -MP -MF .dep/$(@F).d
|
ASFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
|
ASXFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
CFLAGS += -MD -MP -MF .dep/$(@F).d
|
CFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
CPPFLAGS += -MD -MP -MF .dep/$(@F).d
|
CPPFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
|
|
||||||
|
|
|
@ -74,6 +74,7 @@ LDFLAGS = $(MCFLAGS) $(OPT) $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--c
|
||||||
|
|
||||||
# Generate dependency information
|
# Generate dependency information
|
||||||
ASFLAGS += -MD -MP -MF .dep/$(@F).d
|
ASFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
|
ASXFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
CFLAGS += -MD -MP -MF .dep/$(@F).d
|
CFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
CPPFLAGS += -MD -MP -MF .dep/$(@F).d
|
CPPFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
|
|
||||||
|
|
|
@ -100,6 +100,7 @@ LDFLAGS = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PR
|
||||||
|
|
||||||
# Generate dependency information
|
# Generate dependency information
|
||||||
ASFLAGS += -MD -MP -MF .dep/$(@F).d
|
ASFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
|
ASXFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
CFLAGS += -MD -MP -MF .dep/$(@F).d
|
CFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
CPPFLAGS += -MD -MP -MF .dep/$(@F).d
|
CPPFLAGS += -MD -MP -MF .dep/$(@F).d
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue