Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Some changes so that the Mac build differences don't impact the Linux build until the Linux compilers come into line with the Mac ports single compiler

Browse Source
This commit is contained in:
Bernard Davison
2011-02-10 23:42:42 +11:00
parent 5412fc3227
commit 804abc6105
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.stm32
+27 -14
View File
@@ -99,14 +99,20 @@ LDSCRIPT = $($(TARGET).LDSCRIPT)
endif
endif
CFLAGS = -I. -I./$(ARCH) $(INCLUDES) -D__thumb2__ -Wall -c -msoft-float -O$(OPT)
UNAME = $(shell uname -s)
CFLAGS = -I. -I./$(ARCH) $(INCLUDES) -D__thumb2__ -Wall -msoft-float -O$(OPT)
CFLAGS += -Wl,gc-sections
CFLAGS += -mcpu=$(MCU) -mthumb -ansi -mfix-cortex-m3-ldrd
CFLAGS += -mcpu=$(MCU) -mthumb -ansi
ifeq ("$(UNAME)","Darwin")
CFLAGS += -mfix-cortex-m3-ldrd
endif
CFLAGS += -std=gnu99
#CFLAGS += -malignment-traps
CFLAGS += -fno-common
CFLAGS += -fno-common
CFLAGS += -g$(DEBUG)
CFLAGS += -ffunction-sections -fdata-sections
CFLAGS += -Wall -Wimplicit
CFLAGS += -Wimplicit
CFLAGS += -Wcast-align
CFLAGS += -Wpointer-arith -Wswitch
CFLAGS += -Wredundant-decls -Wreturn-type -Wshadow -Wunused
@@ -119,10 +125,17 @@ CFLAGS += -Wswitch-default
CFLAGS += $($(TARGET).CFLAGS)
AFLAGS = -ahls -mapcs-32 -mcpu=$(MCU) -mthumb
AFLAGS = -ahls -mapcs-32
ifeq ("$(UNAME)","Darwin")
AFLAGS += -mcpu=$(MCU) -mthumb
endif
AFLAGS += -x assembler-with-cpp -Wa,-adhlns=$(OBJDIR)/$(<:.S=.lst),--g$(DEBUG)
LDFLAGS = -T$(LDSCRIPT) -nostartfiles -O$(OPT) --gc-sections -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
ifeq ("$(UNAME)","Darwin")
LDFLAGS = -T$(LDSCRIPT) -nostartfiles -O$(OPT) --gc-sections -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
else
LDFLAGS = -D__thumb2__ -T$(LDSCRIPT) -nostartfiles -L$(GCC_LIB_DIR) -O$(OPT) --gc-sections
endif
LDFLAGS += -Wl,-Map=$(OBJDIR)/$(TARGET).map,--cref,--gc-sections
LDLIBS += -lc -lm -lgcc -lcmsis -lstm32
@@ -138,14 +151,14 @@ ODFLAGS = -S
all: printcommands sizebefore build sizeafter
printcommands:
$(Q)echo "Using CC = $(CC)"
$(Q)echo "Using LD = $(LD)"
$(Q)echo "Using CP = $(CP)"
$(Q)echo "Using DMP = $(DMP)"
$(Q)echo "Using NM = $(NM)"
$(Q)echo "Using SIZE = $(SIZE)"
$(Q)echo "Using RM = $(RM)"
$(Q)echo "Using OOCD = $(OOCD)"
@echo "Using CC = $(CC)"
@echo "Using LD = $(LD)"
@echo "Using CP = $(CP)"
@echo "Using DMP = $(DMP)"
@echo "Using NM = $(NM)"
@echo "Using SIZE = $(SIZE)"
@echo "Using RM = $(RM)"
@echo "Using OOCD = $(OOCD)"
build: elf bin hex
# lss sym