From: Jeff King <peff@peff.net>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Lars Schneider <larsxschneider@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2] travis-ci: enable more warnings on travis linux-gcc job
Date: Sat, 17 Mar 2018 12:08:32 -0400 [thread overview]
Message-ID: <20180317160832.GB15772@sigill.intra.peff.net> (raw)
In-Reply-To: <20180317145923.GA24689@duynguyen.home>
On Sat, Mar 17, 2018 at 03:59:23PM +0100, Duy Nguyen wrote:
> On Sat, Mar 17, 2018 at 03:29:31PM +0100, Lars Schneider wrote:
> > I interpreted Peff's comment like this:
> >
> > If DEVELOPER=1 is set and we detect a gcc-6 in the makefile,
> > then we could set your additional flags in the makefile.
> >
> > This way every developer with a new compiler would run these
> > flags locally (if DEVELOPER=1 is set).
>
> Aha. Something like this? I split developer cflags out to a separate
> file because I imagine people may start to add gcc7, clang....
Yeah, gcc 7 is already standard on debian unstable, so...
> +GCC_VER := $(shell sh -c '$(CC) --version | grep ^gcc >/dev/null && $(CC) -dumpversion | cut -f 1 -d .')
> +
> +ifeq ($(GCC_VER),6)
...this probably needs to be "greater than or equal to".
Unfortunately I think that's hard to do in pure make. But we're already
relying on $(shell) here, so we could just move the logic there.
Something like the patch below, perhaps. It should do the right thing on
clang and gcc, and I added in an extra clang-only warning I've found
useful. Otherwise the list of flags comes from your patch.
The "clang4" limit is just what I happened to have on my system to test
with. Some of those flags might work for clang3, and some of the
gcc6-only flags might work on newer versions of clang.
I was puzzled by -Wno-maybe-uninitialized, though. I think that has
found bugs for us before (but also false positives, but we usually
squelch those in the code). And it's part of -Wall, not -Wextra, so we
shouldn't need it as part of this patch, should we?
diff --git a/Makefile b/Makefile
index a1d8775adb..9dfd152a1e 100644
--- a/Makefile
+++ b/Makefile
@@ -442,15 +442,6 @@ GIT-VERSION-FILE: FORCE
# CFLAGS and LDFLAGS are for the users to override from the command line.
CFLAGS = -g -O2 -Wall
-DEVELOPER_CFLAGS = -Werror \
- -Wdeclaration-after-statement \
- -Wno-format-zero-length \
- -Wold-style-definition \
- -Woverflow \
- -Wpointer-arith \
- -Wstrict-prototypes \
- -Wunused \
- -Wvla
LDFLAGS =
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -1051,7 +1042,7 @@ include config.mak.uname
-include config.mak
ifdef DEVELOPER
-CFLAGS += $(DEVELOPER_CFLAGS)
+include config.mak.dev
endif
comma := ,
diff --git a/config.mak.dev b/config.mak.dev
new file mode 100644
index 0000000000..59aef342c4
--- /dev/null
+++ b/config.mak.dev
@@ -0,0 +1,28 @@
+CFLAGS += -Werror
+CFLAGS += -Wdeclaration-after-statement
+CFLAGS += -Wno-format-zero-length
+CFLAGS += -Wold-style-definition
+CFLAGS += -Woverflow
+CFLAGS += -Wpointer-arith
+CFLAGS += -Wstrict-prototypes
+CFLAGS += -Wunused
+CFLAGS += -Wvla
+
+COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
+
+ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
+CFLAGS += -Wtautological-constant-out-of-range-compare
+endif
+
+ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),)
+CFLAGS += -Wextra
+CFLAGS += -Wmissing-prototypes
+CFLAGS += -Wno-empty-body
+CFLAGS += -Wno-missing-field-initializers
+CFLAGS += -Wno-sign-compare
+CFLAGS += -Wno-unused-function
+CFLAGS += -Wno-unused-parameter
+ifneq ($(filter gcc6,$(COMPILER_FEATURES)),)
+CFLAGS += -Wno-maybe-uninitialized
+endif
+endif
diff --git a/detect-compiler b/detect-compiler
new file mode 100755
index 0000000000..043367828c
--- /dev/null
+++ b/detect-compiler
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# Probe the compiler for vintage, version, etc. This is used for setting
+# optional make knobs under the DEVELOPER knob.
+
+CC="$*"
+
+print_flags() {
+ family=$1
+ version=$($CC -dumpversion | cut -f 1 -d .)
+
+ # Print a feature flag not only for the current version, but also
+ # for any prior versions we encompass. This avoids needing to do
+ # numeric comparisons in make, which are awkward.
+ while test "$version" -gt 0
+ do
+ echo $family$version
+ version=$((version - 1))
+ done
+}
+
+case "$($CC --version 2>&1)" in
+gcc*)
+ print_flags gcc
+ ;;
+clang*)
+ print_flags clang
+ ;;
+*)
+ : unknown compiler family
+ ;;
+esac
--
2.17.0.rc0.402.ged0b3fd1ee
next prev parent reply other threads:[~2018-03-17 16:08 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-03 1:46 [PATCH] travis-ci: enable more warnings on travis linux-gcc job Nguyễn Thái Ngọc Duy
2018-03-16 19:33 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2018-03-16 21:22 ` Jeff King
2018-03-17 8:01 ` Duy Nguyen
2018-03-17 14:29 ` Lars Schneider
2018-03-17 14:59 ` Duy Nguyen
2018-03-17 16:08 ` Jeff King [this message]
2018-03-17 16:12 ` Jeff King
2018-03-17 23:50 ` Junio C Hamano
2018-03-18 8:18 ` [PATCH] Makefile: detect compiler and enable more warnings in DEVELOPER=1 Nguyễn Thái Ngọc Duy
2018-03-18 9:06 ` Eric Sunshine
2018-03-18 9:17 ` Duy Nguyen
2018-03-18 9:20 ` Jeff King
2018-03-18 9:24 ` Eric Sunshine
2018-03-18 9:28 ` Jeff King
2018-03-18 9:37 ` Eric Sunshine
2018-03-18 9:26 ` Jeff King
2018-03-18 9:45 ` Duy Nguyen
2018-03-18 15:55 ` Duy Nguyen
2018-03-18 18:56 ` Ramsay Jones
2018-03-19 16:30 ` Duy Nguyen
2018-03-20 5:32 ` Jeff King
2018-03-24 12:53 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2018-03-25 0:40 ` Eric Sunshine
2018-03-26 22:02 ` Junio C Hamano
2018-03-27 15:03 ` Duy Nguyen
2018-03-27 16:52 ` Junio C Hamano
2018-03-29 15:03 ` [PATCH v3 0/3] Enable more compiler warnings for devs Nguyễn Thái Ngọc Duy
2018-03-29 15:03 ` [PATCH v3 1/3] connect.c: mark die_initial_contact() NORETURN Nguyễn Thái Ngọc Duy
2018-03-29 15:03 ` [PATCH v3 2/3] Makefile: detect compiler and enable more warnings in DEVELOPER=1 Nguyễn Thái Ngọc Duy
2018-03-29 15:03 ` [PATCH v3 3/3] Makefile: add EAGER_DEVELOPER mode Nguyễn Thái Ngọc Duy
2018-03-31 16:40 ` [PATCH 4/3] Makefile: untangle DEVELOPER and -Werror Ævar Arnfjörð Bjarmason
2018-03-31 18:36 ` Duy Nguyen
2018-04-03 9:19 ` Ævar Arnfjörð Bjarmason
2018-04-03 15:17 ` Duy Nguyen
2018-04-06 21:42 ` Jeff King
2018-04-07 9:52 ` Duy Nguyen
2018-04-07 12:36 ` Ævar Arnfjörð Bjarmason
2018-04-07 17:03 ` Duy Nguyen
2018-04-07 18:38 ` Ævar Arnfjörð Bjarmason
2018-04-14 19:19 ` [PATCH v4 0/4] Make DEVELOPER more more flexible with DEVOPTS Ævar Arnfjörð Bjarmason
2018-04-16 4:57 ` Junio C Hamano
2018-04-14 19:19 ` [PATCH v4 1/4] connect.c: mark die_initial_contact() NORETURN Ævar Arnfjörð Bjarmason
2018-04-14 19:19 ` [PATCH v4 2/4] Makefile: detect compiler and enable more warnings in DEVELOPER=1 Ævar Arnfjörð Bjarmason
2018-04-14 19:19 ` [PATCH v4 3/4] Makefile: add a DEVOPTS to suppress -Werror under DEVELOPER Ævar Arnfjörð Bjarmason
2018-04-14 19:19 ` [PATCH v4 4/4] Makefile: add a DEVOPTS to get all of -Wextra Ævar Arnfjörð Bjarmason
2018-03-17 15:16 ` [PATCH v2] travis-ci: enable more warnings on travis linux-gcc job Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180317160832.GB15772@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).