From d539e7f94b74633201893e698b2af4353613a17d Mon Sep 17 00:00:00 2001 From: JDierkse Date: Fri, 17 Apr 2020 12:35:48 +0200 Subject: [PATCH] Disable -Wlogical-op --- Makefile.conf.armv6-stretch | 2 -- Makefile.conf.armv8-stretch | 2 -- Makefile.conf.base | 4 ++-- Makefile.conf.x86_64-alpine | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile.conf.armv6-stretch b/Makefile.conf.armv6-stretch index d621a35..a049b4f 100644 --- a/Makefile.conf.armv6-stretch +++ b/Makefile.conf.armv6-stretch @@ -16,5 +16,3 @@ CFLAGS += -I$(ARCHBASEDIR)/include -I$(ARCHBASEDIR)/include/arm-linux-gnueabihf LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot - -CFLAGS += -Wno-logical-op diff --git a/Makefile.conf.armv8-stretch b/Makefile.conf.armv8-stretch index 8b1957c..1d1f7a0 100644 --- a/Makefile.conf.armv8-stretch +++ b/Makefile.conf.armv8-stretch @@ -16,5 +16,3 @@ CFLAGS += -I$(ARCHBASEDIR)/include -I$(ARCHBASEDIR)/include/arm-linux-gnueabihf LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot - -CFLAGS += -Wno-logical-op diff --git a/Makefile.conf.base b/Makefile.conf.base index 1270630..47e66f2 100644 --- a/Makefile.conf.base +++ b/Makefile.conf.base @@ -3,9 +3,9 @@ # CFLAGS += -g3 -O3 -fPIC -std=c++11 -CFLAGS += -Wall -Wextra -Wstrict-aliasing -pedantic -fmax-errors=5 -Werror -Wunreachable-code -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wnoexcept -Woverloaded-virtual -Wsign-promo -Wstrict-null-sentinel -fdiagnostics-show-option +CFLAGS += -Wall -Wextra -Wstrict-aliasing -pedantic -fmax-errors=5 -Werror -Wunreachable-code -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-include-dirs -Wnoexcept -Woverloaded-virtual -Wsign-promo -Wstrict-null-sentinel -fdiagnostics-show-option CFLAGS += -Wno-unused -Wno-variadic-macros -Wno-parentheses -Wno-unused-parameter -# CFLAGS += -Wold-style-cast -Wundef -Wshadow -Wcast-qual -Wctor-dtor-privacy -Wredundant-decls -Wstrict-overflow=5 -Wcast-align -Wswitch-default +# CFLAGS += -Wold-style-cast -Wundef -Wshadow -Wcast-qual -Wctor-dtor-privacy -Wredundant-decls -Wstrict-overflow=5 -Wcast-align -Wswitch-default -Wlogical-op CFLAGS += -ffunction-sections -fdata-sections LFLAGS += -Wl,--gc-sections diff --git a/Makefile.conf.x86_64-alpine b/Makefile.conf.x86_64-alpine index 22c32c3..89680a9 100644 --- a/Makefile.conf.x86_64-alpine +++ b/Makefile.conf.x86_64-alpine @@ -15,4 +15,4 @@ CFLAGS += -I$(ARCHBASEDIR)/include -I$(ARCHBASEDIR)/x86_64-linux-musl/include LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/x86_64-linux-musl/lib -L$(ARCHBASEDIR)/x86_64-linux-musl/usr/lib LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/x86_64-linux-musl/lib -Wl,-rpath,$(ARCHBASEDIR)/x86_64-linux-musl/usr/lib -CFLAGS += -Wno-stringop-truncation -Wno-logical-op +CFLAGS += -Wno-stringop-truncation