summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc1
-rwxr-xr-xutil/xcompile/xcompile2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index e9c5054e8a17..4ca173b866d4 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -414,7 +414,6 @@ CFLAGS_common += -Wstrict-aliasing -Wshadow -Wdate-time -Wtype-limits -Wvla
CFLAGS_common += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
CFLAGS_common += -ffunction-sections -fdata-sections -fno-pie
ifeq ($(CONFIG_COMPILER_GCC),y)
-CFLAGS_common += -fno-delete-null-pointer-checks
# Don't add these GCC specific flags when running scan-build
ifeq ($(CCC_ANALYZER_OUTPUT_FORMAT),)
CFLAGS_common += -Wno-packed-not-aligned
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 8335c347fbff..a116407b8b30 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -221,7 +221,7 @@ SUBARCH_SUPPORTED+=${TSUPP-${TARCH}}
GCC_CC_${TARCH}:=${GCC}
GCC_CFLAGS_${TARCH}:=${CFLAGS_GCC}
# Generally available for GCC's cc1:
-GCC_CFLAGS_${TARCH}+=-Wlogical-op
+GCC_CFLAGS_${TARCH}+=-fno-delete-null-pointer-checks -Wlogical-op
GCC_ADAFLAGS_${TARCH}:=${CFLAGS_GCC}
GCC_COMPILER_RT_${TARCH}:=${CC_RT_GCC}
GCC_COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC}