aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2019-12-03 23:20:50 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-12-03 23:20:50 +0000
commit1c5f90fb742ccf56879eb19c8313a983dbaad1b2 (patch)
tree81e505d8f9c8d37910e51f75bf3aa71d0a0c31a6
parent45d4611563038486890b40d61e41b68213326afc (diff)
parent9ab81b5ea9811b673668c43289bb48c85c4f9659 (diff)
downloadtrusted-firmware-a-1c5f90fb742ccf56879eb19c8313a983dbaad1b2.tar.gz
Merge "Refactor the warning flags" into integration
-rw-r--r--Makefile24
1 files changed, 14 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 721246d518..534896a790 100644
--- a/Makefile
+++ b/Makefile
@@ -228,6 +228,13 @@ endif
ASFLAGS_aarch32 = $(march32-directive)
ASFLAGS_aarch64 = $(march64-directive)
+# General warnings
+WARNINGS := -Wall -Wmissing-include-dirs -Wunused \
+ -Wdisabled-optimization -Wvla \
+ -Wno-unused-parameter
+
+# Additional warnings
+# Level 1
WARNING1 := -Wextra
WARNING1 += -Wmissing-declarations
WARNING1 += -Wmissing-format-attribute
@@ -253,17 +260,14 @@ WARNING3 += -Wredundant-decls
WARNING3 += -Wswitch-default
ifeq (${W},1)
-WARNINGS := $(WARNING1)
+WARNINGS += $(WARNING1)
else ifeq (${W},2)
-WARNINGS := $(WARNING1) $(WARNING2)
+WARNINGS += $(WARNING1) $(WARNING2)
else ifeq (${W},3)
-WARNINGS := $(WARNING1) $(WARNING2) $(WARNING3)
+WARNINGS += $(WARNING1) $(WARNING2) $(WARNING3)
endif
-WARNINGS += -Wunused -Wno-unused-parameter \
- -Wdisabled-optimization \
- -Wvla
-
+# Compiler specific warnings
ifeq ($(findstring clang,$(notdir $(CC))),)
# not using clang
WARNINGS += -Wunused-but-set-variable \
@@ -279,12 +283,12 @@ ifneq (${E},0)
ERRORS := -Werror
endif
-CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \
- -Wmissing-include-dirs $(ERRORS) $(WARNINGS)
+CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \
+ $(ERRORS) $(WARNINGS)
ASFLAGS += $(CPPFLAGS) $(ASFLAGS_$(ARCH)) \
-ffreestanding -Wa,--fatal-warnings
TF_CFLAGS += $(CPPFLAGS) $(TF_CFLAGS_$(ARCH)) \
- -ffreestanding -fno-builtin -Wall -std=gnu99 \
+ -ffreestanding -fno-builtin -std=gnu99 \
-Os -ffunction-sections -fdata-sections
ifeq (${SANITIZE_UB},on)