[build] use same float_abi for linking as for compiling

This commit is contained in:
Felix Ruess
2015-01-16 18:03:29 +01:00
parent 5372c880e8
commit 58ca0696bd
+5 -3
View File
@@ -38,9 +38,11 @@ OPT ?= 3
CSTANDARD = -std=gnu99 CSTANDARD = -std=gnu99
CINCS = $(INCLUDES) -I$(PAPARAZZI_SRC)/sw/include CINCS = $(INCLUDES) -I$(PAPARAZZI_SRC)/sw/include
FLOAT_ABI = -mfloat-abi=softfp -mfpu=vfp
# Compiler flags. # Compiler flags.
CFLAGS += $(CINCS) CFLAGS += $(CINCS)
CFLAGS += -O$(OPT) -mfloat-abi=softfp -mtune=cortex-a8 -mfpu=vfp -march=armv7-a CFLAGS += -O$(OPT) $(FLOAT_ABI) -mtune=cortex-a8 -march=armv7-a
CFLAGS += -fno-short-enums CFLAGS += -fno-short-enums
# CFLAGS += -malignment-traps # CFLAGS += -malignment-traps
CFLAGS += -Wall -Wcast-qual -Wimplicit -Wcast-align CFLAGS += -Wall -Wcast-qual -Wimplicit -Wcast-align
@@ -59,11 +61,11 @@ CFLAGS += $(CSTANDARD)
CFLAGS += $($(TARGET).CFLAGS) CFLAGS += $($(TARGET).CFLAGS)
CFLAGS += $(USER_CFLAGS) CFLAGS += $(USER_CFLAGS)
LDFLAGS += -lm LDFLAGS += -lm $(FLOAT_ABI)
CXXFLAGS = -pipe -O3 -fshow-column -ffast-math -fPIC CXXFLAGS = -pipe -O3 -fshow-column -ffast-math -fPIC
CXXFLAGS += -g -ffunction-sections -fdata-sections CXXFLAGS += -g -ffunction-sections -fdata-sections
CXXFLAGS += -mfloat-abi=softfp -mtune=cortex-a8 -mfpu=vfp -march=armv7-a CXXFLAGS += $(FLOAT_ABI) -mtune=cortex-a8 -march=armv7-a
CXXFLAGS += -Wall -Wextra CXXFLAGS += -Wall -Wextra
CXXFLAGS += $($(TARGET).CXXFLAGS) CXXFLAGS += $($(TARGET).CXXFLAGS)
CXXFLAGS += $(USER_CFLAGS) CXXFLAGS += $(USER_CFLAGS)