Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 10:46:33 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Obsolete bogus EXTRAFLAGS, add language-specific flags overrides.

Browse Source
This commit is contained in:
px4dev
2013-05-05 16:48:05 -07:00
parent bb94847511
commit 3bf26ac51f
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/toolchain_gnu-arm-eabi.mk
+18 -5
View File
@@ -98,6 +98,14 @@ INSTRUMENTATIONDEFINES = -finstrument-functions \
ARCHCFLAGS = -std=gnu99 ARCHCFLAGS = -std=gnu99
ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++0x ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++0x
# Compatibility
# XXX remove this once downstream users are fixed
#
ifneq ($(EXTRAFLAGS),)
$(warning EXTRAFLAGS is deprecated, use EXTRADEFINES for common pre-processor definitions. See also EXTRACFLAGS, EXTRACXXFLAGS and EXTRALDFLAGS.)
EXTRADEFINES += $(EXTRAFLAGS)
endif
# Generic warnings # Generic warnings
# #
ARCHWARNINGS = -Wall \ ARCHWARNINGS = -Wall \
@@ -144,6 +152,7 @@ CFLAGS = $(ARCHCFLAGS) \
$(INSTRUMENTATIONDEFINES) \ $(INSTRUMENTATIONDEFINES) \
$(ARCHDEFINES) \ $(ARCHDEFINES) \
$(EXTRADEFINES) \ $(EXTRADEFINES) \
$(EXTRACFLAGS) \
-fno-common \ -fno-common \
$(addprefix -I,$(INCLUDE_DIRS)) $(addprefix -I,$(INCLUDE_DIRS))
@@ -156,18 +165,22 @@ CXXFLAGS = $(ARCHCXXFLAGS) \
$(ARCHXXINCLUDES) \ $(ARCHXXINCLUDES) \
$(INSTRUMENTATIONDEFINES) \ $(INSTRUMENTATIONDEFINES) \
$(ARCHDEFINES) \ $(ARCHDEFINES) \
$(EXTRADEFINES) \
-DCONFIG_WCHAR_BUILTIN \ -DCONFIG_WCHAR_BUILTIN \
$(EXTRADEFINES) \
$(EXTRACXXFLAGS) \
$(addprefix -I,$(INCLUDE_DIRS)) $(addprefix -I,$(INCLUDE_DIRS))
# Flags we pass to the assembler # Flags we pass to the assembler
# #
AFLAGS = $(CFLAGS) -D__ASSEMBLY__ AFLAGS = $(CFLAGS) -D__ASSEMBLY__ \
$(EXTRADEFINES) \
$(EXTRAAFLAGS)
# Flags we pass to the linker # Flags we pass to the linker
# #
LDFLAGS += --warn-common \ LDFLAGS += --warn-common \
--gc-sections \ --gc-sections \
$(EXTRALDFLAGS) \
$(addprefix -T,$(LDSCRIPT)) \ $(addprefix -T,$(LDSCRIPT)) \
$(addprefix -L,$(LIB_DIRS)) $(addprefix -L,$(LIB_DIRS))
@@ -189,7 +202,7 @@ DEP_INCLUDES = $(subst .o,.d,$(OBJS))
define COMPILE define COMPILE
@$(ECHO) "CC: $1" @$(ECHO) "CC: $1"
@$(MKDIR) -p $(dir $2) @$(MKDIR) -p $(dir $2)
$(Q) $(CC) -MD -c $(CFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2 $(Q) $(CC) -MD -c $(CFLAGS) $(abspath $1) -o $2
endef endef
# Compile C++ source $1 to $2 # Compile C++ source $1 to $2
@@ -198,7 +211,7 @@ endef
define COMPILEXX define COMPILEXX
@$(ECHO) "CXX: $1" @$(ECHO) "CXX: $1"
@$(MKDIR) -p $(dir $2) @$(MKDIR) -p $(dir $2)
$(Q) $(CXX) -MD -c $(CXXFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2 $(Q) $(CXX) -MD -c $(CXXFLAGS) $(abspath $1) -o $2
endef endef
# Assemble $1 into $2 # Assemble $1 into $2
@@ -206,7 +219,7 @@ endef
define ASSEMBLE define ASSEMBLE
@$(ECHO) "AS: $1" @$(ECHO) "AS: $1"
@$(MKDIR) -p $(dir $2) @$(MKDIR) -p $(dir $2)
$(Q) $(CC) -c $(AFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2 $(Q) $(CC) -c $(AFLAGS) $(abspath $1) -o $2
endef endef
# Produce partially-linked $1 from files in $2 # Produce partially-linked $1 from files in $2