summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2019-06-18 16:38:29 +0200
committerNico Huber <nico.h@gmx.de>2019-06-21 08:44:49 +0000
commit6d7564cdfebfd6bfab34eadc805b3f926acf0518 (patch)
tree0490f1c9a8f5e2f51d70e9c7ee160bcfe1608192
parentc82d7e76d5583c89434a57553fefa6ba8f464c73 (diff)
downloadcoreboot-6d7564cdfebfd6bfab34eadc805b3f926acf0518.tar.xz
Move -Wlogical-op into xcompile
Clang doesn't know `-Wlogical-op`, so let's move it into xcompile where we can easily distinguish between the two. However, this requires us to split out `GCC_ADAFLAGS*` from `GCC_CFLAGS*`. Change-Id: I6a50de0bc5372f61337f237383d32645ba86b0fd Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33579 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--Makefile.inc2
-rw-r--r--toolchain.inc2
-rwxr-xr-xutil/xcompile/xcompile3
3 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 48879bc9fd..7ac0a829e2 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -401,7 +401,7 @@ endif
CFLAGS_common += -pipe -g -nostdinc -std=gnu11
CFLAGS_common += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS_common += -Wwrite-strings -Wredundant-decls -Wno-trigraphs -Wlogical-op
+CFLAGS_common += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
CFLAGS_common += -Wstrict-aliasing -Wshadow -Wdate-time -Wtype-limits
CFLAGS_common += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
CFLAGS_common += -ffunction-sections -fdata-sections -fno-pie
diff --git a/toolchain.inc b/toolchain.inc
index 0486287444..875cb20387 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -131,7 +131,7 @@ OBJDUMP_$(1) := $(OBJDUMP_$(2))
STRIP_$(1) := $(STRIP_$(2))
READELF_$(1) := $(READELF_$(2))
CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2))
-ADAFLAGS_$(1) = --RTS=$$(obj)/libgnat-$(2)/ $$(ADAFLAGS_common) $$(GCC_CFLAGS_$(2))
+ADAFLAGS_$(1) = --RTS=$$(obj)/libgnat-$(2)/ $$(ADAFLAGS_common) $$(GCC_ADAFLAGS_$(2))
CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -D__ARCH_$(2)__
COMPILER_RT_$(1) := $$(COMPILER_RT_$(2))
COMPILER_RT_FLAGS_$(1) := $$(COMPILER_RT_FLAGS_$(2))
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 050cc59827..e8d6677994 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -225,6 +225,9 @@ SUBARCH_SUPPORTED+=${TSUPP-${TARCH}}
# GCC
GCC_CC_${TARCH}:=${GCC}
GCC_CFLAGS_${TARCH}:=${CFLAGS_GCC}
+# Generally available for GCC's cc1:
+GCC_CFLAGS_${TARCH}+=-Wlogical-op
+GCC_ADAFLAGS_${TARCH}:=${CFLAGS_GCC}
GCC_COMPILER_RT_${TARCH}:=${CC_RT_GCC}
GCC_COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC}