7 files changed, 13 insertions, 52 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index eb43b73..61218dc 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -231,6 +231,7 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
   # Append more extra warning flags that only gcc 7.x+ knows about
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
     ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-7")
     if (HDF5_ENABLE_DEV_WARNINGS)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
     #else ()
diff --git a/config/gnu-flags b/config/gnu-flags
index fe6626d..e25f59b 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -254,6 +254,7 @@ if test "X-gcc" = "X-$cc_vendor"; then
     # gcc >= 7
     if test $cc_vers_major -ge 7; then
         H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 7)"
+        H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-7)"
         DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-7)"
     fi
 
diff --git a/config/gnu-warnings/7 b/config/gnu-warnings/7
index 9d5b44d..cb8834a 100644
--- a/config/gnu-warnings/7
+++ b/config/gnu-warnings/7
@@ -3,4 +3,3 @@
 -Wduplicated-branches
 -Wformat-overflow=2
 -Wformat-truncation=1
--Wrestrict
diff --git a/config/gnu-warnings/error-7 b/config/gnu-warnings/error-7
new file mode 100644
index 0000000..8eb9fe4
--- /dev/null
+++ b/config/gnu-warnings/error-7
@@ -0,0 +1 @@
+-Werror=restrict
diff --git a/config/gnu-warnings/error-8 b/config/gnu-warnings/error-8
index cbb25f6..36c1414 100644
--- a/config/gnu-warnings/error-8
+++ b/config/gnu-warnings/error-8
@@ -6,17 +6,4 @@
 # in order to detect initializations that occur there.  It's possible
 # that GCC 8 only performs that analysis at -O3, though.
 #
-#
-# NOTE: File Driver files are not compatible with these warnings as errors
-#     H5FDlog.c,
-#       -Werror=maybe-uninitialized
--Wmaybe-uninitialized
-# NOTE: src/ files are not compatible with these warnings as errors
-#     src/H5Shyper.c,src/H5SL.c,src/H5Shyper.c
-#       -Werror=maybe-uninitialized
-# NOTE: Test files are not compatible with these warnings as errors
-#     test/cache_common.c,
-#       -Werror=maybe-uninitialized
-# NOTE: hl/src/ files are not compatible with these warnings as errors
-#     hl/src/H5DS.c,
-#       -Werror=maybe-uninitialized
+-Werror=maybe-uninitialized
diff --git a/config/gnu-warnings/error-general b/config/gnu-warnings/error-general
index a66d284..73d1dd5 100644
--- a/config/gnu-warnings/error-general
+++ b/config/gnu-warnings/error-general
@@ -3,7 +3,10 @@
 # circumstances, so ask the compiler to treat them as errors:
 #
 -Werror=bad-function-cast
+-Werror=cast-align
+-Werror=format
 -Werror=implicit-function-declaration
+-Werror=int-to-pointer-cast
 -Werror=missing-declarations
 -Werror=missing-prototypes
 -Werror=nested-externs
@@ -11,10 +14,11 @@
 -Werror=packed
 -Werror=pointer-sign
 -Werror=pointer-to-int-cast
--Werror=int-to-pointer-cast
 -Werror=redundant-decls
 -Werror=strict-prototypes
 -Werror=switch
+-Werror=unused-but-set-variable
+-Werror=unused-variable
 #
 #-Werror=discarded-qualifiers
 #
@@ -25,43 +29,11 @@
 #
 -Wunused-function
 #
-#     H5FDdrvr_module.h
-#       -Werror=unused-variable
-#
--Wunused-variable
-#
 #     H5VLpassthru.c
 #       -Werror=unused-parameter
 #
 -Wunused-parameter
 #
-#
-#
-# NOTE: Tools files are not compatible with these warnings as errors
-#     lib/h5tools.c
-#       -Werror=cast-align
-#
--Wcast-align
-#
-#     lib/h5diff_array.c
-#       -Werror=unused-but-set-variable
-#
--Wunused-but-set-variable
-#
-#     lib/h5tools_utils.c
-#       -Werror=unused-parameter
-#
-#
-# NOTE: JNI files are not compatible with these warnings as errors
-#     jni/h5pDCPLImp.c,jni/nativeData.c,jni/h5util.c,jni/h5rImp.c
-#     jni/h5sImp.c,jni/h5tImp.c
-#       -Werror=cast-align
-#     jni/h5util.c
-#       -Werror=format(-overflow)
-#
--Werror=format
-#
-#
 #Examples and tests do not use the same set of extensive warning flags as libraries
 # Here is a list of tests and examples that have issues with the stricter warnings as error
 #
diff --git a/config/ibm-aix b/config/ibm-aix
index b4a558d..f48f9d8 100644
--- a/config/ibm-aix
+++ b/config/ibm-aix
@@ -47,10 +47,10 @@ if test "X-" = "X-$FC"; then
   fi
 fi
 
-# While we try to avoid setting FCFLAGS directly for use in compilation, in 
-# this case we need the -k flag present for some configure checks. As such, 
-# the configure script saves the user's set FCFLAGS before running, and 
-# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS 
+# While we try to avoid setting FCFLAGS directly for use in compilation, in
+# this case we need the -k flag present for some configure checks. As such,
+# the configure script saves the user's set FCFLAGS before running, and
+# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS
 # to ensure the flag is present for both configure as well as for the build.
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG="-qsuffix=f=f90"