summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-07-16 16:07:48 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-07-16 16:07:48 (GMT)
commitebc274a67398ff079fad2120ab4eeb31a1bf2a1b (patch)
tree1a41a88a296a6a933874f869004c840f22c6dadd
parent6816d5b2e7313514dbec370447905fe9741696e9 (diff)
parentd7144b2fa40b1be59e6250313c5e5f1a2bd8fb25 (diff)
downloadhdf5-ebc274a67398ff079fad2120ab4eeb31a1bf2a1b.zip
hdf5-ebc274a67398ff079fad2120ab4eeb31a1bf2a1b.tar.gz
hdf5-ebc274a67398ff079fad2120ab4eeb31a1bf2a1b.tar.bz2
Merge pull request #1803 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:lets_retire_jam to develop
* commit 'd7144b2fa40b1be59e6250313c5e5f1a2bd8fb25': Restored warnings for older gcc so jam can continue to creak along.
-rw-r--r--config/gnu-flags14
1 files changed, 12 insertions, 2 deletions
diff --git a/config/gnu-flags b/config/gnu-flags
index 9b61907..ae8ddb0 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -174,7 +174,6 @@ if test "X-gcc" = "X-$cc_vendor"; then
H5_CFLAGS="$H5_CFLAGS -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpacked"
H5_CFLAGS="$H5_CFLAGS -Wredundant-decls -Wshadow -Wstrict-prototypes -Wswitch-enum -Wswitch-default"
H5_CFLAGS="$H5_CFLAGS -Wundef -Wunused-macros -Wunsafe-loop-optimizations -Wwrite-strings"
- H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560"
######################
# Developer warnings #
@@ -194,6 +193,12 @@ if test "X-gcc" = "X-$cc_vendor"; then
H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
fi
+ # -Wvolatile-register-var was later incorporated into -Wall and
+ # only needs to be specified explicitly for gcc 4.2-4.3
+ if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -eq 4 -a $$cc_vers_minor -le 3; then
+ H5_CFLAGS="$H5_CFLAGS -Wvolatile-register-var"
+ fi
+
# -Wstrict-aliasing was later incorporated into -Wall and
# only needs to be specified explicitly for gcc 4.5-4.6
if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -le 6; then
@@ -201,7 +206,7 @@ if test "X-gcc" = "X-$cc_vendor"; then
fi
# The non-valued form of -Wstrict-overflow is used in gcc 4.2-4.4
- if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -eq 4 -a $cc_vers_minor -le 4; then
+ if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -a $cc_vers_major -eq 4 -a $cc_vers_minor -le 4; then
H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
fi
@@ -215,6 +220,11 @@ if test "X-gcc" = "X-$cc_vendor"; then
# Version-specific warnings #
#############################
+ # gcc 4.3
+ if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 3; then
+ H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560"
+ fi
+
# gcc 4.4
if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 4; then
H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"