Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / simd / impl_ibm_vsx / impl_ibm_vsx.h

diff --git a/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx.h b/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx.h
index 26a820876752d1eb5d6fdc04cb7fa58a638432d3..e69fd33c3999c521c4361e4488d0a1a43b18f5f3 100644 (file)
--- a/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx.h
+++ b/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -36,6 +36,11 @@
 #ifndef GMX_SIMD_IMPLEMENTATION_IBM_VSX_H
 #define GMX_SIMD_IMPLEMENTATION_IBM_VSX_H
 
+// At high optimization levels, gcc 7.2 gives false
+// positives.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+
 // While we do our best to also test VSX with Power7, that depends on having
 // access to big-endian hardware, so for the long term our focus will be
 // little-endian Power8.
@@ -48,4 +53,6 @@
 #include "impl_ibm_vsx_util_double.h"
 #include "impl_ibm_vsx_util_float.h"
 
+#pragma GCC diagnostic pop
+
 #endif // GMX_SIMD_IMPLEMENTATION_IBM_VSX_H