Converted duplicated flags code to a set of if statements.

1 files changed, 117 insertions, 435 deletions

diff --git a/config/gnu-flags b/config/gnu-flags
index f401d3d..585c2b4 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -37,10 +37,10 @@ if test X = "X$cc_flags_set"; then
     cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
     cc_version=`echo $cc_version |sed 's/[-a-z]//g'`
     if test X = "X$cc_vendor" -a X != "X$cc_version"; then
-    cc_vendor=gcc
+        cc_vendor=gcc
     fi
     if test "-" != "$cc_vendor-$cc_version"; then
-    echo "compiler '$CC' is GNU $cc_vendor-$cc_version"
+        echo "compiler '$CC' is GNU $cc_vendor-$cc_version"
     fi
 
     # Some version numbers
@@ -127,29 +127,29 @@ case "$cc_vendor-$cc_version" in
     # Production
     # NDEBUG is handled explicitly by the configure script
     case "$cc_vendor-$cc_version" in
-      gcc-4.*)
-        PROD_CFLAGS=
-        ;;
-      gcc-[56789].*)
-        PROD_CFLAGS="-fstdarg-opt"
-        ;;
-      *)
-        # gcc automatically inlines based on the optimization level
-        # this is just a failsafe
-        PROD_CFLAGS="-finline-functions"
-        ;;
+        gcc-4.*)
+            PROD_CFLAGS=
+            ;;
+        gcc-[56789].*)
+            PROD_CFLAGS="-fstdarg-opt"
+            ;;
+        *)
+            # gcc automatically inlines based on the optimization level
+            # this is just a failsafe
+            PROD_CFLAGS="-finline-functions"
+            ;;
     esac
 
     # Debug
     # NDEBUG is handled explicitly by the configure script
     # -g is handled by the symbols flags
     case "$cc_vendor-$cc_version" in
-      gcc-[56789].*)
-        DEBUG_CFLAGS="-ftrapv -fno-common"
-        ;;
-      *)
-        DEBUG_CFLAGS=
-        ;;
+        gcc-[56789].*)
+            DEBUG_CFLAGS="-ftrapv -fno-common"
+            ;;
+        *)
+            DEBUG_CFLAGS=
+            ;;
     esac
 
     # Developer warnings (suggestions from gcc, not code problems)
@@ -166,18 +166,18 @@ case "$cc_vendor-$cc_version" in
 
     # Optimization
     case "$cc_vendor-$cc_version" in
-      gcc-4.*)
-        HIGH_OPT_CFLAGS="-O3"
-        DEBUG_OPT_CFLAGS=
-        ;;
-      gcc-[56789].*)
-        HIGH_OPT_CFLAGS="-O3"
-        DEBUG_OPT_CFLAGS="-Og"
-        ;;
-      *)
-        HIGH_OPT_CFLAGS="-O"
-        DEBUG_OPT_CFLAGS=
-        ;;
+        gcc-4.*)
+            HIGH_OPT_CFLAGS="-O3"
+            DEBUG_OPT_CFLAGS=
+            ;;
+        gcc-[56789].*)
+            HIGH_OPT_CFLAGS="-O3"
+            DEBUG_OPT_CFLAGS="-Og"
+            ;;
+        *)
+            HIGH_OPT_CFLAGS="-O"
+            DEBUG_OPT_CFLAGS=
+            ;;
     esac
     NO_OPT_CFLAGS="-O0"
 
@@ -186,434 +186,116 @@ case "$cc_vendor-$cc_version" in
     ;;
 esac
 
-# Version specific GCC flags
-#
-# Please follow the pattern below by adding new versions at the top, copying
-# the information from the previous version and adding modifications to that.
-case "$cc_vendor-$cc_version" in
-
-# When the gcc 10.x release is out, we should check for additional flags to
-# include and break it out into it's own section, like the other versions
-# below. -QAK
-  gcc-9*)
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
-
-    # Append warning flags that only gcc 4.7+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
-
-    # Append warning flags that only gcc 4.8+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=format"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=format"
-
-    # Append warning flags that only gcc 4.9+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdate-time"
-
-    # Append warning flags that only gcc 5.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Warray-bounds=2 -Wc99-c11-compat"
-
-    # Append warning flags that only gcc 6.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wnull-dereference -Wunused-const-variable -Wduplicated-cond -Whsa -Wnormalized"
-
-    # Append warning flags that only gcc 7.x+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wstringop-overflow=2"
-    H5_CFLAGS="$H5_CFLAGS -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=5 -Wrestrict"
-
-    # Append warning flags that only gcc 8.x+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wstringop-overflow=4 -Wsuggest-attribute=cold -Wsuggest-attribute=malloc"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=cold -Wno-suggest-attribute=malloc"
-    H5_CFLAGS="$H5_CFLAGS -Wattribute-alias -Wcast-align=strict -Wshift-overflow=2"
-
-    # Append warning flags that only gcc 9.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wattribute-alias=2 -Wmissing-profile"
-    ;;
-
-  gcc-8*)
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
-
-    # Append warning flags that only gcc 4.7+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
-
-    # Append warning flags that only gcc 4.8+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=format"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=format"
+# Version-specific GCC flags
+if test "X-gcc" = "X-$cc_vendor"; then
 
-    # Append warning flags that only gcc 4.9+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdate-time"
-
-    # Append warning flags that only gcc 5.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Warray-bounds=2 -Wc99-c11-compat"
-
-    # Append warning flags that only gcc 6.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wnull-dereference -Wunused-const-variable -Wduplicated-cond -Whsa -Wnormalized"
-
-    # Append warning flags that only gcc 7.x+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wstringop-overflow=2"
-    H5_CFLAGS="$H5_CFLAGS -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=5 -Wrestrict"
-
-    # Append warning flags that only gcc 8.x+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wstringop-overflow=4 -Wsuggest-attribute=cold -Wsuggest-attribute=malloc"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=cold -Wno-suggest-attribute=malloc"
-    H5_CFLAGS="$H5_CFLAGS -Wattribute-alias -Wcast-align=strict -Wshift-overflow=2"
-    ;;
-
-  gcc-7*)
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
     #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
-
-    # Append warning flags that only gcc 4.7+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
-
-    # Append warning flags that only gcc 4.8+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=format"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=format"
-
-    # Append warning flags that only gcc 4.9+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdate-time"
-
-    # Append warning flags that only gcc 5.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Warray-bounds=2 -Wc99-c11-compat"
-
-    # Append warning flags that only gcc 6.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wnull-dereference -Wunused-const-variable -Wduplicated-cond -Whsa -Wnormalized"
-
-    # Append warning flags that only gcc 7.x+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wstringop-overflow=2"
-    H5_CFLAGS="$H5_CFLAGS -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=5 -Wrestrict"
-    ;;
-
-  gcc-6*)
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
+    # Special cases
     #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
-
-    # Append warning flags that only gcc 4.7+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
-
-    # Append warning flags that only gcc 4.8+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=format"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=format"
-
-    # Append warning flags that only gcc 4.9+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdate-time"
-
-    # Append warning flags that only gcc 5.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Warray-bounds=2 -Wc99-c11-compat"
-
-    # Append warning flags that only gcc 6.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wnull-dereference -Wunused-const-variable -Wduplicated-cond -Whsa -Wnormalized"
-    ;;
-
-  gcc-5*)
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
-
-    # Append warning flags that only gcc 4.7+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
 
-    # Append warning flags that only gcc 4.8+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=format"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=format"
-
-    # Append warning flags that only gcc 4.9+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdate-time"
-
-    # Append warning flags that only gcc 5.x+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Warray-bounds=2 -Wc99-c11-compat"
-    ;;
-
-  gcc-4.9*)
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560 -Wvla"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
-
-    # Append warning flags that only gcc 4.7+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
-
-    # Append warning flags that only gcc 4.8+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=format"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=format"
-
-    # Append warning flags that only gcc 4.9+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdate-time"
-    ;;
-
-  gcc-4.8*)
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560 -Wvla"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init"
+    # Disable warnings about using the 'long long' type w/ gcc 4.6 and earlier
+    if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -eq 4 -a $$cc_vers_minor -le 6; then
+        H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
+    fi
 
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
+    # -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
 
-    # Append warning flags that only gcc 4.7+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
+    # -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
+        H5_CFLAGS="$H5_CFLAGS -Wstrict-aliasing"
+    fi
 
-    # Append warning flags that only gcc 4.8+ knows about
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=format"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=format"
-    ;;
+    # 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
+        H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
+    fi
 
-  gcc-4.7*)
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
+    # -Wvla was later incorporated into -Wpedantic and
+    # only needs to be specified explicitly for gcc 4
+    if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2; then
+        H5_CFLAGS="$H5_CFLAGS -Wvla"
+    fi
 
-    # Append warning flags that only gcc 4.3+ knows about
     #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560 -Wvla"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
-
-    # Append warning flags that only gcc 4.7+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
-    ;;
-
-  gcc-4.6*)
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
+    # Main version-specific flags
     #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560 -Wvla"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-aliasing -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
 
-    # Append warning flags that only gcc 4.6+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
-    DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
-    NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
-    ;;
-
-  gcc-4.5*)
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags that only gcc 4.2+ knows about
-    # (none, or incorporated in -Wall / -Wextra now)
-
-    # Append warning flags that only gcc 4.3+ knows about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560 -Wvla"
-
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append warning flags that only gcc 4.5+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-aliasing -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-    ;;
-
-  gcc-4.4*)
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags that only gcc 4.2+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Append warning flags that only gcc 4.3+ knows about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2560 -Wvla"
+    # 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
 
-    # Append warning flags that only gcc 4.4+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-    ;;
+    # 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"
+    fi
 
-  gcc-4.3*)
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
+    # gcc 4.5
+    if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 5; then
+        H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
+    fi
 
-    # Append warning flags that only gcc 4.1+ knows about
-    # -Wvolatile-register-var was later incorporated into -Wall and
-    # needs to be specified explicitly for gcc 4.1-4.3.
-    H5_CFLAGS="$H5_CFLAGS -Wvolatile-register-var"
+    # gcc 4.6
+    if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 6; then
+        H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wtrampolines"
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=const"
+        NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=const"
+    fi
 
-    # Append warning flags that only gcc 4.2+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
+    # gcc 4.7
+    if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 7; then
+        H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance"
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
+        NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=pure -Wno-suggest-attribute=noreturn"
+    fi
 
-    # Append warning flags that only gcc 4.3+ knows about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wvla"
-    ;;
+    # gcc 4.8
+    if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8; then
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wsuggest-attribute=format"
+        NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=format"
+    fi
 
-  gcc-4.2*)
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
+    # gcc 4.9
+    if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 9; then
+        H5_CFLAGS="$H5_CFLAGS -Wdate-time"
+    fi
 
-    # Append warning flags that only gcc 4.1+ knows about
-    # -Wvolatile-register-var was later incorporated into -Wall and
-    # needs to be specified explicitly for gcc 4.1-4.3.
-    H5_CFLAGS="$H5_CFLAGS -Wvolatile-register-var"
+    # gcc 5
+    if test $cc_vers_major -ge 5; then
+        H5_CFLAGS="$H5_CFLAGS -Warray-bounds=2 -Wc99-c11-compat"
+    fi
 
-    # Append warning flags that only gcc 4.2+ knows about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-    ;;
+    # gcc 6
+    if test $cc_vers_major -ge 6; then
+        H5_CFLAGS="$H5_CFLAGS -Wnull-dereference -Wunused-const-variable -Wduplicated-cond -Whsa -Wnormalized"
+    fi
 
-  gcc-4.1*)
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
+    # gcc 7
+    if test $cc_vers_major -ge 7; then
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wstringop-overflow=2"
+        H5_CFLAGS="$H5_CFLAGS -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=5 -Wrestrict"
+    fi
 
-    # Append warning flags that only gcc 4.1+ knows about
-    # -Wvolatile-register-var was later incorporated into -Wall and
-    # needs to be specified explicitly for gcc 4.1-4.3.
-    H5_CFLAGS="$H5_CFLAGS -Wvolatile-register-var"
-    ;;
+    # gcc 8
+    if test $cc_vers_major -ge 8; then
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wstringop-overflow=4 -Wsuggest-attribute=cold -Wsuggest-attribute=malloc"
+        NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-suggest-attribute=cold -Wno-suggest-attribute=malloc"
+        H5_CFLAGS="$H5_CFLAGS -Wattribute-alias -Wcast-align=strict -Wshift-overflow=2"
+    fi
 
-esac
+    # gcc 9
+    if test $cc_vers_major -ge 9; then
+        H5_CFLAGS="$H5_CFLAGS -Wattribute-alias=2 -Wmissing-profile"
+    fi
+fi
 
 # Clear cc info if no flags set
 if test "X$cc_flags_set" = "X"; then
-  cc_vendor=
-  cc_version=
+    cc_vendor=
+    cc_version=
 fi