From 9e7a8f48e88ce035c5ebcd8d27adcce830bdb6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B6ppner?= Date: Tue, 31 Oct 2023 17:39:44 +0100 Subject: [PATCH] common.mak: Set default C/C++ standard to gnu11/gnu++11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s390-tools doesn't define a common C/C++ standard at the moment. Set the standard to gnu11/gnu++11, which is also used by the Kernel, and establish a common baseline for all tools. The -std flag is added to ALL_CFLAGS and ALL_CXXFLAGS to avoid losing it in case CFLAGS are set by an outside entity. It is also added to CLAGS_FOR_BUILD for this one special cross build case. The -std flag is removed from all tools that set it manually until now. Reviewed-by: Steffen Eiden Reviewed-by: Marc Hartmayer Reviewed-by: Benjamin Block Signed-off-by: Jan Höppner --- common.mak | 6 +++--- dump2tar/src/Makefile | 2 +- genprotimg/src/Makefile | 2 +- libpv/Makefile | 3 +-- pvattest/src/Makefile | 3 +-- zdev/src/Makefile | 3 +-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/common.mak b/common.mak index 467f72a6..7a3b8f36 100644 --- a/common.mak +++ b/common.mak @@ -304,7 +304,7 @@ ZFCPDUMP_FLAVOR = zfcpdump export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_INITRD ZFCPDUMP_FLAVOR CFLAGS ?= $(DEFAULT_CFLAGS) $(OPT_FLAGS) -CFLAGS_FOR_BUILD ?= $(DEFAULT_CFLAGS) $(OPT_FLAGS) +CFLAGS_FOR_BUILD ?= -std=gnu11 $(DEFAULT_CFLAGS) $(OPT_FLAGS) CPPFLAGS ?= $(DEFAULT_CPPFLAGS) LDFLAGS ?= $(DEFAULT_LDFLAGS) @@ -313,14 +313,14 @@ ALL_CFLAGS = -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ -DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \ -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \ -DS390_TOOLS_BINDIR=$(BINDIR) \ - $(CFLAGS) + -std=gnu11 $(CFLAGS) CXXFLAGS ?= $(DEFAULT_CFLAGS) $(OPT_FLAGS) ALL_CXXFLAGS = -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \ -DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \ -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \ -DS390_TOOLS_BINDIR=$(BINDIR) \ - $(CXXFLAGS) + -std=gnu++11 $(CXXFLAGS) ALL_CPPFLAGS = -I $(rootdir)include $(CPPFLAGS) ALL_LDFLAGS = $(LDFLAGS) diff --git a/dump2tar/src/Makefile b/dump2tar/src/Makefile index 78e24346..6fe9f11d 100644 --- a/dump2tar/src/Makefile +++ b/dump2tar/src/Makefile @@ -1,7 +1,7 @@ # Common definitions include ../../common.mak -ALL_CPPFLAGS += -I../include -std=gnu99 -Wno-unused-parameter +ALL_CPPFLAGS += -I../include -Wno-unused-parameter LDLIBS += -lpthread -lrt ifneq ($(HAVE_ZLIB),0) ALL_CPPFLAGS += -DHAVE_ZLIB diff --git a/genprotimg/src/Makefile b/genprotimg/src/Makefile index 67b61dc5..08734bff 100644 --- a/genprotimg/src/Makefile +++ b/genprotimg/src/Makefile @@ -27,7 +27,7 @@ $(bin_PROGRAM)_SRCS := $(bin_PROGRAM).c pv/pv_stage3.c pv/pv_image.c \ $(NULL) $(bin_PROGRAM)_OBJS := $($(bin_PROGRAM)_SRCS:.c=.o) -ALL_CFLAGS += -std=gnu11 -DPKGDATADIR=$(PKGDATADIR) \ +ALL_CFLAGS += -DPKGDATADIR=$(PKGDATADIR) \ $(GLIB2_CFLAGS) $(LIBCRYPTO_CFLAGS) $(LIBCURL_CFLAGS) \ -DOPENSSL_API_COMPAT=0x10100000L \ $(WARNINGS) \ diff --git a/libpv/Makefile b/libpv/Makefile index 46742261..abbf42f3 100644 --- a/libpv/Makefile +++ b/libpv/Makefile @@ -21,8 +21,7 @@ WARNINGS := -Wall -Wextra -Wshadow \ -Wno-unused-function -Wno-unused-parameter -Wno-unused-variable \ $(NULL) -ALL_CFLAGS += -std=gnu11 \ - -DOPENSSL_API_COMPAT=0x10101000L \ +ALL_CFLAGS += -DOPENSSL_API_COMPAT=0x10101000L \ $(GLIB2_CFLAGS) \ $(LIBCRYPTO_CFLAGS) \ $(LIBCURL_CFLAGS) \ diff --git a/pvattest/src/Makefile b/pvattest/src/Makefile index 881d1fdf..f4a7a583 100644 --- a/pvattest/src/Makefile +++ b/pvattest/src/Makefile @@ -35,8 +35,7 @@ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcrypto) LIBCURL_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags libcurl) LIBCURL_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcurl) -ALL_CFLAGS += -std=gnu11 \ - -DPKGDATADIR=$(PKGDATADIR) \ +ALL_CFLAGS += -DPKGDATADIR=$(PKGDATADIR) \ -DOPENSSL_API_COMPAT=0x10101000L \ $(GLIB2_CFLAGS) \ $(LIBCRYPTO_CFLAGS) \ diff --git a/zdev/src/Makefile b/zdev/src/Makefile index f90f73e8..181b7c19 100644 --- a/zdev/src/Makefile +++ b/zdev/src/Makefile @@ -1,8 +1,7 @@ # Common definitions include ../../common.mak -ALL_CPPFLAGS += -I ../include -std=gnu99 -Wno-unused-parameter \ - -Wno-missing-field-initializers +ALL_CPPFLAGS += -I ../include -Wno-unused-parameter -Wno-missing-field-initializers # Adding ZDEV_ALWAYS_UPDATE_INITRD=1 option will update the initial RAM-disk # without the user interaction upon the modification of a persistent device