Merge Mesa 13.0.6

author: Jonathan Gray <jsg@cvs.openbsd.org> 2017-03-25 00:29:31 +0000
committer: Jonathan Gray <jsg@cvs.openbsd.org> 2017-03-25 00:29:31 +0000
commit: c83cf8802f5c955b3ff83408a0f5c41f63fcb415 (patch)
tree: 23e00e49e6f2ceaae6e560f8ca02088ecd62c3bc /lib
parent: 0ad866088a8e454456ac70baecf687d8a5d778c6 (diff)
127 files changed, 189 insertions, 38 deletions
diff --git a/lib/mesa/Makefile.in b/lib/mesa/Makefile.in
index b052445ac..59ecb920c 100644
--- a/lib/mesa/Makefile.in
+++ b/lib/mesa/Makefile.in
@@ -201,6 +201,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/configure b/lib/mesa/configure
index 901d269b5..39a4de71f 100755
--- a/lib/mesa/configure
+++ b/lib/mesa/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Mesa 13.0.5.
+# Generated by GNU Autoconf 2.69 for Mesa 13.0.6.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Mesa'
 PACKAGE_TARNAME='mesa'
-PACKAGE_VERSION='13.0.5'
-PACKAGE_STRING='Mesa 13.0.5'
+PACKAGE_VERSION='13.0.6'
+PACKAGE_STRING='Mesa 13.0.6'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa'
 PACKAGE_URL=''
 
@@ -793,6 +793,7 @@ HAVE_CLOVER_ICD_FALSE
 HAVE_CLOVER_ICD_TRUE
 HAVE_CLOVER_FALSE
 HAVE_CLOVER_TRUE
+CLOVER_STD_OVERRIDE
 LIBCLC_LIBEXECDIR
 LIBCLC_INCLUDEDIR
 LIBELF_LIBS
@@ -1822,7 +1823,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Mesa 13.0.5 to adapt to many kinds of systems.
+\`configure' configures Mesa 13.0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1893,7 +1894,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Mesa 13.0.5:";;
+     short | recursive ) echo "Configuration of Mesa 13.0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -2227,7 +2228,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Mesa configure 13.0.5
+Mesa configure 13.0.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2946,7 +2947,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Mesa $as_me 13.0.5, which was
+It was created by Mesa $as_me 13.0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3882,7 +3883,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mesa'
- VERSION='13.0.5'
+ VERSION='13.0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -25184,6 +25185,28 @@ if test "x$enable_opencl" = xyes; then
     if test "x$have_libelf" != xyes; then
        as_fn_error $? "Clover requires libelf" "$LINENO" 5
     fi
+
+    if test "x${ac_cv_cxx_compiler_gnu}" = xyes; then
+        altivec_enabled=no
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #if !defined(__VEC__) || !defined(__ALTIVEC__)
+        #error "AltiVec not enabled"
+        #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  altivec_enabled=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+        if test "$altivec_enabled" = yes; then
+            CLOVER_STD_OVERRIDE="-std=gnu++11"
+        fi
+
+    fi
+
 fi
  if test "x$enable_opencl" = xyes; then
   HAVE_CLOVER_TRUE=
@@ -28663,7 +28686,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Mesa $as_me 13.0.5, which was
+This file was extended by Mesa $as_me 13.0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28720,7 +28743,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Mesa config.status 13.0.5
+Mesa config.status 13.0.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/lib/mesa/configure.ac b/lib/mesa/configure.ac
index 7a1186906..09de43cf6 100644
--- a/lib/mesa/configure.ac
+++ b/lib/mesa/configure.ac
@@ -1978,6 +1978,21 @@ if test "x$enable_opencl" = xyes; then
     if test "x$have_libelf" != xyes; then
        AC_MSG_ERROR([Clover requires libelf])
     fi
+
+    if test "x${ac_cv_cxx_compiler_gnu}" = xyes; then
+        altivec_enabled=no
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+        #if !defined(__VEC__) || !defined(__ALTIVEC__)
+        #error "AltiVec not enabled"
+        #endif
+        ])], altivec_enabled=yes)
+
+        if test "$altivec_enabled" = yes; then
+            CLOVER_STD_OVERRIDE="-std=gnu++11"
+        fi
+        AC_SUBST([CLOVER_STD_OVERRIDE])
+    fi
+
 fi
 AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
 AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
diff --git a/lib/mesa/include/CL/cl_d3d10.h b/lib/mesa/include/CL/cl_d3d10.h
index 94a338ca1..6ae059ce1 100644
--- a/lib/mesa/include/CL/cl_d3d10.h
+++ b/lib/mesa/include/CL/cl_d3d10.h
@@ -21,7 +21,7 @@
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  **********************************************************************************/
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $ */
 
 #ifndef __OPENCL_CL_D3D10_H
 #define __OPENCL_CL_D3D10_H
diff --git a/lib/mesa/include/CL/cl_d3d11.h b/lib/mesa/include/CL/cl_d3d11.h
index 575d2cdec..6260345b4 100644
--- a/lib/mesa/include/CL/cl_d3d11.h
+++ b/lib/mesa/include/CL/cl_d3d11.h
@@ -21,7 +21,7 @@
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  **********************************************************************************/
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $ */
 
 #ifndef __OPENCL_CL_D3D11_H
 #define __OPENCL_CL_D3D11_H
diff --git a/lib/mesa/include/CL/cl_dx9_media_sharing.h b/lib/mesa/include/CL/cl_dx9_media_sharing.h
index 2e2db9eb8..1f05fcb65 100644
--- a/lib/mesa/include/CL/cl_dx9_media_sharing.h
+++ b/lib/mesa/include/CL/cl_dx9_media_sharing.h
@@ -21,7 +21,7 @@
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  **********************************************************************************/
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $ */
 
 #ifndef __OPENCL_CL_DX9_MEDIA_SHARING_H
 #define __OPENCL_CL_DX9_MEDIA_SHARING_H
diff --git a/lib/mesa/include/CL/cl_ext.h b/lib/mesa/include/CL/cl_ext.h
index 36f6c290c..3a3c1d23a 100644
--- a/lib/mesa/include/CL/cl_ext.h
+++ b/lib/mesa/include/CL/cl_ext.h
@@ -21,7 +21,7 @@
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  ******************************************************************************/
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $ */
 
 /* cl_ext.h contains OpenCL extensions which don't have external */
 /* (OpenGL, D3D) dependencies.                                   */
diff --git a/lib/mesa/include/CL/cl_gl_ext.h b/lib/mesa/include/CL/cl_gl_ext.h
index 98c0eff8d..9c242d472 100644
--- a/lib/mesa/include/CL/cl_gl_ext.h
+++ b/lib/mesa/include/CL/cl_gl_ext.h
@@ -21,7 +21,7 @@
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  **********************************************************************************/
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $ */
 
 /* cl_gl_ext.h contains vendor (non-KHR) OpenCL extensions which have           */
 /* OpenGL dependencies.                                                         */
diff --git a/lib/mesa/include/CL/cl_platform.h b/lib/mesa/include/CL/cl_platform.h
index 528fd603c..1012e0552 100644
--- a/lib/mesa/include/CL/cl_platform.h
+++ b/lib/mesa/include/CL/cl_platform.h
@@ -21,7 +21,7 @@
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  **********************************************************************************/
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $ */
 
 #ifndef __CL_PLATFORM_H
 #define __CL_PLATFORM_H
diff --git a/lib/mesa/include/CL/opencl.h b/lib/mesa/include/CL/opencl.h
index bb3e1524d..18e8fee77 100644
--- a/lib/mesa/include/CL/opencl.h
+++ b/lib/mesa/include/CL/opencl.h
@@ -21,7 +21,7 @@
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  ******************************************************************************/
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $ */
 
 #ifndef __OPENCL_H
 #define __OPENCL_H
diff --git a/lib/mesa/include/EGL/egl.h b/lib/mesa/include/EGL/egl.h
index 52ce070c4..dbafdc855 100644
--- a/lib/mesa/include/EGL/egl.h
+++ b/lib/mesa/include/EGL/egl.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $
 */
 
 #include <EGL/eglplatform.h>
diff --git a/lib/mesa/include/EGL/eglext.h b/lib/mesa/include/EGL/eglext.h
index 0e3c2049d..3cd4a5de0 100644
--- a/lib/mesa/include/EGL/eglext.h
+++ b/lib/mesa/include/EGL/eglext.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $
 */
 
 #include <EGL/eglplatform.h>
diff --git a/lib/mesa/include/EGL/eglplatform.h b/lib/mesa/include/EGL/eglplatform.h
index 349b2a92d..49457e92a 100644
--- a/lib/mesa/include/EGL/eglplatform.h
+++ b/lib/mesa/include/EGL/eglplatform.h
@@ -25,7 +25,7 @@
 */
 
 /* Platform-specific types and definitions for egl.h
- * $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+ * $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $
  *
  * Adopters may modify khrplatform.h and this file to suit their platform.
  * You are encouraged to submit all modifications to the Khronos group so that
diff --git a/lib/mesa/include/GL/glcorearb.h b/lib/mesa/include/GL/glcorearb.h
index fd6c89457..6c5d13ee3 100644
--- a/lib/mesa/include/GL/glcorearb.h
+++ b/lib/mesa/include/GL/glcorearb.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:27 $
 */
 
 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
diff --git a/lib/mesa/include/GL/glext.h b/lib/mesa/include/GL/glext.h
index 5415791c5..d9994c69b 100644
--- a/lib/mesa/include/GL/glext.h
+++ b/lib/mesa/include/GL/glext.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
 */
 
 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
diff --git a/lib/mesa/include/GL/glxext.h b/lib/mesa/include/GL/glxext.h
index 96fb7acb0..b4f5ddb2b 100644
--- a/lib/mesa/include/GL/glxext.h
+++ b/lib/mesa/include/GL/glxext.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
 */
 
 #define GLX_GLXEXT_VERSION 20160531
diff --git a/lib/mesa/include/GL/wglext.h b/lib/mesa/include/GL/wglext.h
index 1f6fa8478..331c154d7 100644
--- a/lib/mesa/include/GL/wglext.h
+++ b/lib/mesa/include/GL/wglext.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
 */
 
 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
diff --git a/lib/mesa/include/GLES/egl.h b/lib/mesa/include/GLES/egl.h
index 3e127b83b..e7dc2bcc3 100644
--- a/lib/mesa/include/GLES/egl.h
+++ b/lib/mesa/include/GLES/egl.h
@@ -3,7 +3,7 @@
  * applications. Several early implementations included gl.h
  * in egl.h leading applications to include only egl.h
  *
- * $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+ * $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
  */
 
 #ifndef __legacy_egl_h_
diff --git a/lib/mesa/include/GLES/gl.h b/lib/mesa/include/GLES/gl.h
index cb09b6034..79e777dcd 100644
--- a/lib/mesa/include/GLES/gl.h
+++ b/lib/mesa/include/GLES/gl.h
@@ -1,7 +1,7 @@
 #ifndef __gl_h_
 #define __gl_h_
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $ */
 
 #include <GLES/glplatform.h>
 
diff --git a/lib/mesa/include/GLES/glext.h b/lib/mesa/include/GLES/glext.h
index 1f7fc0010..224b28ac1 100644
--- a/lib/mesa/include/GLES/glext.h
+++ b/lib/mesa/include/GLES/glext.h
@@ -1,7 +1,7 @@
 #ifndef __glext_h_
 #define __glext_h_
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $ */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/mesa/include/GLES/glplatform.h b/lib/mesa/include/GLES/glplatform.h
index d15225c72..b1fe38463 100644
--- a/lib/mesa/include/GLES/glplatform.h
+++ b/lib/mesa/include/GLES/glplatform.h
@@ -1,7 +1,7 @@
 #ifndef __glplatform_h_
 #define __glplatform_h_
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $ */
 
 /*
  * This document is licensed under the SGI Free Software B License Version
diff --git a/lib/mesa/include/GLES2/gl2.h b/lib/mesa/include/GLES2/gl2.h
index 0c560bc8b..ee57d7320 100644
--- a/lib/mesa/include/GLES2/gl2.h
+++ b/lib/mesa/include/GLES2/gl2.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
 */
 
 #include <GLES2/gl2platform.h>
diff --git a/lib/mesa/include/GLES2/gl2ext.h b/lib/mesa/include/GLES2/gl2ext.h
index 01ea18bc3..3f4f3a3a7 100644
--- a/lib/mesa/include/GLES2/gl2ext.h
+++ b/lib/mesa/include/GLES2/gl2ext.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
 */
 
 #ifndef GL_APIENTRYP
diff --git a/lib/mesa/include/GLES2/gl2platform.h b/lib/mesa/include/GLES2/gl2platform.h
index f74a79b36..cd9dc151f 100644
--- a/lib/mesa/include/GLES2/gl2platform.h
+++ b/lib/mesa/include/GLES2/gl2platform.h
@@ -1,7 +1,7 @@
 #ifndef __gl2platform_h_
 #define __gl2platform_h_
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $ */
 
 /*
  * This document is licensed under the SGI Free Software B License Version
diff --git a/lib/mesa/include/GLES3/gl3.h b/lib/mesa/include/GLES3/gl3.h
index 263b1c46c..af8df8fb6 100644
--- a/lib/mesa/include/GLES3/gl3.h
+++ b/lib/mesa/include/GLES3/gl3.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
 */
 
 #include <GLES3/gl3platform.h>
diff --git a/lib/mesa/include/GLES3/gl31.h b/lib/mesa/include/GLES3/gl31.h
index 3d0489e4e..c55e6d98a 100644
--- a/lib/mesa/include/GLES3/gl31.h
+++ b/lib/mesa/include/GLES3/gl31.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+** Khronos $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
 */
 
 #include <GLES3/gl3platform.h>
diff --git a/lib/mesa/include/GLES3/gl3ext.h b/lib/mesa/include/GLES3/gl3ext.h
index 39a393171..fbbb94c5b 100644
--- a/lib/mesa/include/GLES3/gl3ext.h
+++ b/lib/mesa/include/GLES3/gl3ext.h
@@ -1,7 +1,7 @@
 #ifndef __gl3ext_h_
 #define __gl3ext_h_
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $ */
 
 /*
  * This document is licensed under the SGI Free Software B License Version
diff --git a/lib/mesa/include/GLES3/gl3platform.h b/lib/mesa/include/GLES3/gl3platform.h
index e53165af5..bdfc8c027 100644
--- a/lib/mesa/include/GLES3/gl3platform.h
+++ b/lib/mesa/include/GLES3/gl3platform.h
@@ -1,7 +1,7 @@
 #ifndef __gl3platform_h_
 #define __gl3platform_h_
 
-/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
+/* $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $ */
 
 /*
  * This document is licensed under the SGI Free Software B License Version
diff --git a/lib/mesa/include/KHR/khrplatform.h b/lib/mesa/include/KHR/khrplatform.h
index 5639cd794..04c86ee73 100644
--- a/lib/mesa/include/KHR/khrplatform.h
+++ b/lib/mesa/include/KHR/khrplatform.h
@@ -26,7 +26,7 @@
 
 /* Khronos platform-specific types and definitions.
  *
- * $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
+ * $Revision: 1.6 $ on $Date: 2017/03/25 00:29:28 $
  *
  * Adopters may modify this file to suit their platform. Adopters are
  * encouraged to submit platform specific modifications to the Khronos
diff --git a/lib/mesa/src/Makefile.in b/lib/mesa/src/Makefile.in
index c05f926d8..ef2ede0b9 100644
--- a/lib/mesa/src/Makefile.in
+++ b/lib/mesa/src/Makefile.in
@@ -263,6 +263,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/amd/Makefile.in b/lib/mesa/src/amd/Makefile.in
index 262839b60..35dbf23dd 100644
--- a/lib/mesa/src/amd/Makefile.in
+++ b/lib/mesa/src/amd/Makefile.in
@@ -215,6 +215,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/amd/common/Makefile.in b/lib/mesa/src/amd/common/Makefile.in
index b15b5f5ae..94e800cef 100644
--- a/lib/mesa/src/amd/common/Makefile.in
+++ b/lib/mesa/src/amd/common/Makefile.in
@@ -203,6 +203,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/amd/vulkan/Makefile.in b/lib/mesa/src/amd/vulkan/Makefile.in
index 327fc33ca..079fb4b02 100644
--- a/lib/mesa/src/amd/vulkan/Makefile.in
+++ b/lib/mesa/src/amd/vulkan/Makefile.in
@@ -322,6 +322,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/compiler/Makefile.in b/lib/mesa/src/compiler/Makefile.in
index 69e0c15ff..81461a4e6 100644
--- a/lib/mesa/src/compiler/Makefile.in
+++ b/lib/mesa/src/compiler/Makefile.in
@@ -521,6 +521,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/egl/Makefile.in b/lib/mesa/src/egl/Makefile.in
index cd747103b..cc2ead011 100644
--- a/lib/mesa/src/egl/Makefile.in
+++ b/lib/mesa/src/egl/Makefile.in
@@ -295,6 +295,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/egl/drivers/dri2/egl_dri2.c b/lib/mesa/src/egl/drivers/dri2/egl_dri2.c
index f1f473ca6..196d3c776 100644
--- a/lib/mesa/src/egl/drivers/dri2/egl_dri2.c
+++ b/lib/mesa/src/egl/drivers/dri2/egl_dri2.c
@@ -1086,6 +1086,20 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
    if (!_eglInitContext(&dri2_ctx->base, disp, conf, attrib_list))
       goto cleanup;
 
+   /* The EGL_EXT_create_context_robustness spec says:
+    *
+    *    "Add to the eglCreateContext context creation errors: [...]
+    *
+    *     * If the reset notification behavior of <share_context> and the
+    *       newly created context are different then an EGL_BAD_MATCH error is
+    *       generated."
+    */
+   if (share_list && share_list->ResetNotificationStrategy !=
+                     dri2_ctx->base.ResetNotificationStrategy) {
+      _eglError(EGL_BAD_MATCH, "eglCreateContext");
+      goto cleanup;
+   }
+
    switch (dri2_ctx->base.ClientAPI) {
    case EGL_OPENGL_ES_API:
       switch (dri2_ctx->base.ClientMajorVersion) {
diff --git a/lib/mesa/src/egl/wayland/wayland-drm/Makefile.in b/lib/mesa/src/egl/wayland/wayland-drm/Makefile.in
index 852d277c5..8a28a8d77 100644
--- a/lib/mesa/src/egl/wayland/wayland-drm/Makefile.in
+++ b/lib/mesa/src/egl/wayland/wayland-drm/Makefile.in
@@ -143,6 +143,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/egl/wayland/wayland-egl/Makefile.in b/lib/mesa/src/egl/wayland/wayland-egl/Makefile.in
index b039ed6e7..1ba116e35 100644
--- a/lib/mesa/src/egl/wayland/wayland-egl/Makefile.in
+++ b/lib/mesa/src/egl/wayland/wayland-egl/Makefile.in
@@ -185,6 +185,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/Makefile.in b/lib/mesa/src/gallium/Makefile.in
index 01e0e6406..33676653a 100644
--- a/lib/mesa/src/gallium/Makefile.in
+++ b/lib/mesa/src/gallium/Makefile.in
@@ -198,6 +198,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/auxiliary/Makefile.in b/lib/mesa/src/gallium/auxiliary/Makefile.in
index 64e5b0528..173f549e5 100644
--- a/lib/mesa/src/gallium/auxiliary/Makefile.in
+++ b/lib/mesa/src/gallium/auxiliary/Makefile.in
@@ -485,6 +485,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.in b/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.in
index 3088dbc88..3abeaa18d 100644
--- a/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.in
+++ b/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.in
@@ -191,6 +191,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/ddebug/Makefile.in b/lib/mesa/src/gallium/drivers/ddebug/Makefile.in
index a93d08778..1a6226af8 100644
--- a/lib/mesa/src/gallium/drivers/ddebug/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/ddebug/Makefile.in
@@ -150,6 +150,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/freedreno/Makefile.in b/lib/mesa/src/gallium/drivers/freedreno/Makefile.in
index a9b904a86..70ee05953 100644
--- a/lib/mesa/src/gallium/drivers/freedreno/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/freedreno/Makefile.in
@@ -211,6 +211,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/i915/Makefile.in b/lib/mesa/src/gallium/drivers/i915/Makefile.in
index f8f316bb3..f0cb97e4c 100644
--- a/lib/mesa/src/gallium/drivers/i915/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/i915/Makefile.in
@@ -179,6 +179,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/ilo/Makefile.in b/lib/mesa/src/gallium/drivers/ilo/Makefile.in
index fd61f3ea2..7c6409b38 100644
--- a/lib/mesa/src/gallium/drivers/ilo/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/ilo/Makefile.in
@@ -197,6 +197,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/llvmpipe/Makefile.in b/lib/mesa/src/gallium/drivers/llvmpipe/Makefile.in
index 3a26a7c13..0a7486d64 100644
--- a/lib/mesa/src/gallium/drivers/llvmpipe/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/llvmpipe/Makefile.in
@@ -248,6 +248,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/noop/Makefile.in b/lib/mesa/src/gallium/drivers/noop/Makefile.in
index 709bea70c..dbba0b022 100644
--- a/lib/mesa/src/gallium/drivers/noop/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/noop/Makefile.in
@@ -155,6 +155,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/nouveau/Makefile.in b/lib/mesa/src/gallium/drivers/nouveau/Makefile.in
index 01160d958..d753c9551 100644
--- a/lib/mesa/src/gallium/drivers/nouveau/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/nouveau/Makefile.in
@@ -252,6 +252,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/r300/Makefile.in b/lib/mesa/src/gallium/drivers/r300/Makefile.in
index 40a2a4546..075e2646b 100644
--- a/lib/mesa/src/gallium/drivers/r300/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/r300/Makefile.in
@@ -201,6 +201,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/r600/Makefile.in b/lib/mesa/src/gallium/drivers/r600/Makefile.in
index 92152df6d..feb606222 100644
--- a/lib/mesa/src/gallium/drivers/r600/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/r600/Makefile.in
@@ -189,6 +189,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/radeon/Makefile.in b/lib/mesa/src/gallium/drivers/radeon/Makefile.in
index 8e5f0fc19..d720beb87 100644
--- a/lib/mesa/src/gallium/drivers/radeon/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/radeon/Makefile.in
@@ -179,6 +179,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/radeonsi/Makefile.in b/lib/mesa/src/gallium/drivers/radeonsi/Makefile.in
index eca8bb83f..34bca39d5 100644
--- a/lib/mesa/src/gallium/drivers/radeonsi/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/radeonsi/Makefile.in
@@ -177,6 +177,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/rbug/Makefile.in b/lib/mesa/src/gallium/drivers/rbug/Makefile.in
index 3d1e8c2e7..be583e989 100644
--- a/lib/mesa/src/gallium/drivers/rbug/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/rbug/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/softpipe/Makefile.in b/lib/mesa/src/gallium/drivers/softpipe/Makefile.in
index 1bd728b1f..a25d07b66 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/softpipe/Makefile.in
@@ -181,6 +181,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/svga/Makefile.in b/lib/mesa/src/gallium/drivers/svga/Makefile.in
index dbecdd672..cc7ceb091 100644
--- a/lib/mesa/src/gallium/drivers/svga/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/svga/Makefile.in
@@ -198,6 +198,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@ -std=gnu99
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/swr/Makefile.in b/lib/mesa/src/gallium/drivers/swr/Makefile.in
index bcf339000..931fd358e 100644
--- a/lib/mesa/src/gallium/drivers/swr/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/swr/Makefile.in
@@ -361,6 +361,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/trace/Makefile.in b/lib/mesa/src/gallium/drivers/trace/Makefile.in
index e851e33fe..d7fe8f275 100644
--- a/lib/mesa/src/gallium/drivers/trace/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/trace/Makefile.in
@@ -151,6 +151,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/vc4/Makefile.in b/lib/mesa/src/gallium/drivers/vc4/Makefile.in
index 5e027a504..8fe17ab6d 100644
--- a/lib/mesa/src/gallium/drivers/vc4/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/vc4/Makefile.in
@@ -192,6 +192,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/drivers/virgl/Makefile.in b/lib/mesa/src/gallium/drivers/virgl/Makefile.in
index 35115b8d1..dd1ae47ea 100644
--- a/lib/mesa/src/gallium/drivers/virgl/Makefile.in
+++ b/lib/mesa/src/gallium/drivers/virgl/Makefile.in
@@ -174,6 +174,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/clover/Makefile.in b/lib/mesa/src/gallium/state_trackers/clover/Makefile.in
index 035ace3ec..bfc57b10c 100644
--- a/lib/mesa/src/gallium/state_trackers/clover/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/clover/Makefile.in
@@ -238,6 +238,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -611,6 +612,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/src \
 noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
 libcltgsi_la_CXXFLAGS = \
 	-std=c++11 \
+	$(CLOVER_STD_OVERRIDE) \
 	$(VISIBILITY_CXXFLAGS)
 
 libcltgsi_la_SOURCES = $(TGSI_SOURCES)
@@ -618,6 +620,7 @@ libclllvm_la_CXXFLAGS = \
 	-std=c++11 \
 	$(VISIBILITY_CXXFLAGS) \
 	$(LLVM_CXXFLAGS) \
+	$(CLOVER_STD_OVERRIDE) \
 	$(DEFINES) \
 	$(LIBELF_CFLAGS) \
 	-DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
@@ -627,6 +630,7 @@ libclllvm_la_CXXFLAGS = \
 libclllvm_la_SOURCES = $(LLVM_SOURCES)
 libclover_la_CXXFLAGS = \
 	-std=c++11 \
+	$(CLOVER_STD_OVERRIDE) \
 	$(VISIBILITY_CXXFLAGS)
 
 libclover_la_LIBADD = \
diff --git a/lib/mesa/src/gallium/state_trackers/dri/Makefile.in b/lib/mesa/src/gallium/state_trackers/dri/Makefile.in
index d4c6782bd..55566025a 100644
--- a/lib/mesa/src/gallium/state_trackers/dri/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/dri/Makefile.in
@@ -188,6 +188,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.in b/lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.in
index efbfbdfef..6abaaeb84 100644
--- a/lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/nine/Makefile.in b/lib/mesa/src/gallium/state_trackers/nine/Makefile.in
index aa00a312a..463ab5ccb 100644
--- a/lib/mesa/src/gallium/state_trackers/nine/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/nine/Makefile.in
@@ -160,6 +160,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/omx/Makefile.in b/lib/mesa/src/gallium/state_trackers/omx/Makefile.in
index c5fe32433..da6f5a3bc 100644
--- a/lib/mesa/src/gallium/state_trackers/omx/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/omx/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/osmesa/Makefile.in b/lib/mesa/src/gallium/state_trackers/osmesa/Makefile.in
index da9fbec51..aa8b3f9bf 100644
--- a/lib/mesa/src/gallium/state_trackers/osmesa/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/osmesa/Makefile.in
@@ -171,6 +171,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/va/Makefile.in b/lib/mesa/src/gallium/state_trackers/va/Makefile.in
index 06a1d7eab..a161fd530 100644
--- a/lib/mesa/src/gallium/state_trackers/va/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/va/Makefile.in
@@ -178,6 +178,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/vdpau/Makefile.in b/lib/mesa/src/gallium/state_trackers/vdpau/Makefile.in
index 03c8676ba..a5a3afb94 100644
--- a/lib/mesa/src/gallium/state_trackers/vdpau/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/vdpau/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/xa/Makefile.in b/lib/mesa/src/gallium/state_trackers/xa/Makefile.in
index 2ce955edf..5e2103c43 100644
--- a/lib/mesa/src/gallium/state_trackers/xa/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/xa/Makefile.in
@@ -203,6 +203,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/state_trackers/xvmc/Makefile.in b/lib/mesa/src/gallium/state_trackers/xvmc/Makefile.in
index 6b338763d..2d59c9380 100644
--- a/lib/mesa/src/gallium/state_trackers/xvmc/Makefile.in
+++ b/lib/mesa/src/gallium/state_trackers/xvmc/Makefile.in
@@ -216,6 +216,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/d3dadapter9/Makefile.in b/lib/mesa/src/gallium/targets/d3dadapter9/Makefile.in
index ae30b7a5f..2c70839c3 100644
--- a/lib/mesa/src/gallium/targets/d3dadapter9/Makefile.in
+++ b/lib/mesa/src/gallium/targets/d3dadapter9/Makefile.in
@@ -368,6 +368,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/dri/Makefile.in b/lib/mesa/src/gallium/targets/dri/Makefile.in
index a13fff4cc..380d3dc11 100644
--- a/lib/mesa/src/gallium/targets/dri/Makefile.in
+++ b/lib/mesa/src/gallium/targets/dri/Makefile.in
@@ -392,6 +392,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/libgl-xlib/Makefile.in b/lib/mesa/src/gallium/targets/libgl-xlib/Makefile.in
index a8c42602d..c808091d8 100644
--- a/lib/mesa/src/gallium/targets/libgl-xlib/Makefile.in
+++ b/lib/mesa/src/gallium/targets/libgl-xlib/Makefile.in
@@ -241,6 +241,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/omx/Makefile.in b/lib/mesa/src/gallium/targets/omx/Makefile.in
index 5c531d5f8..949369c55 100644
--- a/lib/mesa/src/gallium/targets/omx/Makefile.in
+++ b/lib/mesa/src/gallium/targets/omx/Makefile.in
@@ -281,6 +281,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/opencl/Makefile.in b/lib/mesa/src/gallium/targets/opencl/Makefile.in
index 4aac1973a..adcd06ed9 100644
--- a/lib/mesa/src/gallium/targets/opencl/Makefile.in
+++ b/lib/mesa/src/gallium/targets/opencl/Makefile.in
@@ -197,6 +197,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/osmesa/Makefile.in b/lib/mesa/src/gallium/targets/osmesa/Makefile.in
index 67de0a23f..d78899fb1 100644
--- a/lib/mesa/src/gallium/targets/osmesa/Makefile.in
+++ b/lib/mesa/src/gallium/targets/osmesa/Makefile.in
@@ -250,6 +250,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/Makefile.in b/lib/mesa/src/gallium/targets/pipe-loader/Makefile.in
index 8ef8080d7..bb13a2072 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/Makefile.in
+++ b/lib/mesa/src/gallium/targets/pipe-loader/Makefile.in
@@ -382,6 +382,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/va/Makefile.in b/lib/mesa/src/gallium/targets/va/Makefile.in
index a002b4372..66ccae478 100644
--- a/lib/mesa/src/gallium/targets/va/Makefile.in
+++ b/lib/mesa/src/gallium/targets/va/Makefile.in
@@ -280,6 +280,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/vdpau/Makefile.in b/lib/mesa/src/gallium/targets/vdpau/Makefile.in
index f993de1f6..9127e6384 100644
--- a/lib/mesa/src/gallium/targets/vdpau/Makefile.in
+++ b/lib/mesa/src/gallium/targets/vdpau/Makefile.in
@@ -291,6 +291,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/xa/Makefile.in b/lib/mesa/src/gallium/targets/xa/Makefile.in
index 91fe2b028..3ade84a4a 100644
--- a/lib/mesa/src/gallium/targets/xa/Makefile.in
+++ b/lib/mesa/src/gallium/targets/xa/Makefile.in
@@ -334,6 +334,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/targets/xvmc/Makefile.in b/lib/mesa/src/gallium/targets/xvmc/Makefile.in
index 3f3652ba2..367c9d08e 100644
--- a/lib/mesa/src/gallium/targets/xvmc/Makefile.in
+++ b/lib/mesa/src/gallium/targets/xvmc/Makefile.in
@@ -265,6 +265,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/tests/trivial/Makefile.in b/lib/mesa/src/gallium/tests/trivial/Makefile.in
index d06d6c326..01e4e3c0f 100644
--- a/lib/mesa/src/gallium/tests/trivial/Makefile.in
+++ b/lib/mesa/src/gallium/tests/trivial/Makefile.in
@@ -168,6 +168,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/tests/unit/Makefile.in b/lib/mesa/src/gallium/tests/unit/Makefile.in
index 6298ab88d..8094ba114 100644
--- a/lib/mesa/src/gallium/tests/unit/Makefile.in
+++ b/lib/mesa/src/gallium/tests/unit/Makefile.in
@@ -220,6 +220,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/amdgpu/drm/Makefile.in b/lib/mesa/src/gallium/winsys/amdgpu/drm/Makefile.in
index ee9f44072..5e197a855 100644
--- a/lib/mesa/src/gallium/winsys/amdgpu/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/amdgpu/drm/Makefile.in
@@ -152,6 +152,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/freedreno/drm/Makefile.in b/lib/mesa/src/gallium/winsys/freedreno/drm/Makefile.in
index 54aafc8f1..076fb0815 100644
--- a/lib/mesa/src/gallium/winsys/freedreno/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/freedreno/drm/Makefile.in
@@ -172,6 +172,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/i915/drm/Makefile.in b/lib/mesa/src/gallium/winsys/i915/drm/Makefile.in
index b3c2bd421..08015e56c 100644
--- a/lib/mesa/src/gallium/winsys/i915/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/i915/drm/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/intel/drm/Makefile.in b/lib/mesa/src/gallium/winsys/intel/drm/Makefile.in
index a3aa6bdcd..be50959f2 100644
--- a/lib/mesa/src/gallium/winsys/intel/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/intel/drm/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.in b/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.in
index 0903e6617..7fbc538f5 100644
--- a/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.in
@@ -172,6 +172,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/radeon/drm/Makefile.in b/lib/mesa/src/gallium/winsys/radeon/drm/Makefile.in
index 1ad28ffb4..2ef02fc34 100644
--- a/lib/mesa/src/gallium/winsys/radeon/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/radeon/drm/Makefile.in
@@ -151,6 +151,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/svga/drm/Makefile.in b/lib/mesa/src/gallium/winsys/svga/drm/Makefile.in
index 8a4283fbf..4bccda3e7 100644
--- a/lib/mesa/src/gallium/winsys/svga/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/svga/drm/Makefile.in
@@ -177,6 +177,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@ -std=gnu99
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/sw/dri/Makefile.in b/lib/mesa/src/gallium/winsys/sw/dri/Makefile.in
index b1f53eaf2..a332e329b 100644
--- a/lib/mesa/src/gallium/winsys/sw/dri/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/sw/dri/Makefile.in
@@ -172,6 +172,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/sw/kms-dri/Makefile.in b/lib/mesa/src/gallium/winsys/sw/kms-dri/Makefile.in
index 3c26a671f..e55f239e4 100644
--- a/lib/mesa/src/gallium/winsys/sw/kms-dri/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/sw/kms-dri/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/sw/null/Makefile.in b/lib/mesa/src/gallium/winsys/sw/null/Makefile.in
index 6db73b73f..a99162aea 100644
--- a/lib/mesa/src/gallium/winsys/sw/null/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/sw/null/Makefile.in
@@ -172,6 +172,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/sw/wrapper/Makefile.in b/lib/mesa/src/gallium/winsys/sw/wrapper/Makefile.in
index 8a57f720e..89401215c 100644
--- a/lib/mesa/src/gallium/winsys/sw/wrapper/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/sw/wrapper/Makefile.in
@@ -172,6 +172,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/sw/xlib/Makefile.in b/lib/mesa/src/gallium/winsys/sw/xlib/Makefile.in
index 4b7648ff1..b453f169c 100644
--- a/lib/mesa/src/gallium/winsys/sw/xlib/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/sw/xlib/Makefile.in
@@ -172,6 +172,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/vc4/drm/Makefile.in b/lib/mesa/src/gallium/winsys/vc4/drm/Makefile.in
index 2ae7a34ee..6d5b64297 100644
--- a/lib/mesa/src/gallium/winsys/vc4/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/vc4/drm/Makefile.in
@@ -171,6 +171,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/virgl/drm/Makefile.in b/lib/mesa/src/gallium/winsys/virgl/drm/Makefile.in
index 3954f5bf0..95d0f02b0 100644
--- a/lib/mesa/src/gallium/winsys/virgl/drm/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/virgl/drm/Makefile.in
@@ -172,6 +172,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gallium/winsys/virgl/vtest/Makefile.in b/lib/mesa/src/gallium/winsys/virgl/vtest/Makefile.in
index f44a6640e..9c62086be 100644
--- a/lib/mesa/src/gallium/winsys/virgl/vtest/Makefile.in
+++ b/lib/mesa/src/gallium/winsys/virgl/vtest/Makefile.in
@@ -172,6 +172,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gbm/Makefile.in b/lib/mesa/src/gbm/Makefile.in
index 4f0ba035e..d2e8186f9 100644
--- a/lib/mesa/src/gbm/Makefile.in
+++ b/lib/mesa/src/gbm/Makefile.in
@@ -213,6 +213,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/getopt/getopt.h b/lib/mesa/src/getopt/getopt.h
index d5076bc45..8c4647b3d 100644
--- a/lib/mesa/src/getopt/getopt.h
+++ b/lib/mesa/src/getopt/getopt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getopt.h,v 1.5 2017/02/26 12:28:56 jsg Exp $	*/
+/*	$OpenBSD: getopt.h,v 1.6 2017/03/25 00:29:29 jsg Exp $	*/
 /*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
 
 /*-
diff --git a/lib/mesa/src/getopt/getopt_long.c b/lib/mesa/src/getopt/getopt_long.c
index ef5826a6f..fc263a00d 100644
--- a/lib/mesa/src/getopt/getopt_long.c
+++ b/lib/mesa/src/getopt/getopt_long.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getopt_long.c,v 1.5 2017/02/26 12:28:56 jsg Exp $	*/
+/*	$OpenBSD: getopt_long.c,v 1.6 2017/03/25 00:29:29 jsg Exp $	*/
 /*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
 
 /*
diff --git a/lib/mesa/src/glx/Makefile.in b/lib/mesa/src/glx/Makefile.in
index 5e93285c7..5573174d8 100644
--- a/lib/mesa/src/glx/Makefile.in
+++ b/lib/mesa/src/glx/Makefile.in
@@ -338,6 +338,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/glx/apple/Makefile.in b/lib/mesa/src/glx/apple/Makefile.in
index ae2486178..8e3ae3417 100644
--- a/lib/mesa/src/glx/apple/Makefile.in
+++ b/lib/mesa/src/glx/apple/Makefile.in
@@ -149,6 +149,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/glx/tests/Makefile.in b/lib/mesa/src/glx/tests/Makefile.in
index a22d96503..89593f49c 100644
--- a/lib/mesa/src/glx/tests/Makefile.in
+++ b/lib/mesa/src/glx/tests/Makefile.in
@@ -184,6 +184,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/glx/windows/Makefile.in b/lib/mesa/src/glx/windows/Makefile.in
index c5af0a76e..dd6f0f4b6 100644
--- a/lib/mesa/src/glx/windows/Makefile.in
+++ b/lib/mesa/src/glx/windows/Makefile.in
@@ -183,6 +183,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/gtest/Makefile.in b/lib/mesa/src/gtest/Makefile.in
index adad5e161..ac0ccfb22 100644
--- a/lib/mesa/src/gtest/Makefile.in
+++ b/lib/mesa/src/gtest/Makefile.in
@@ -140,6 +140,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/intel/Makefile.in b/lib/mesa/src/intel/Makefile.in
index 89ed2bc5c..e47aa25c9 100644
--- a/lib/mesa/src/intel/Makefile.in
+++ b/lib/mesa/src/intel/Makefile.in
@@ -349,6 +349,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/intel/tools/Makefile.in b/lib/mesa/src/intel/tools/Makefile.in
index 5d1c8790a..dada64cb3 100644
--- a/lib/mesa/src/intel/tools/Makefile.in
+++ b/lib/mesa/src/intel/tools/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/intel/vulkan/Makefile.in b/lib/mesa/src/intel/vulkan/Makefile.in
index 77c669cba..ac162a251 100644
--- a/lib/mesa/src/intel/vulkan/Makefile.in
+++ b/lib/mesa/src/intel/vulkan/Makefile.in
@@ -400,6 +400,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/loader/Makefile.in b/lib/mesa/src/loader/Makefile.in
index 357006900..4d40b8928 100644
--- a/lib/mesa/src/loader/Makefile.in
+++ b/lib/mesa/src/loader/Makefile.in
@@ -190,6 +190,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mapi/Makefile.in b/lib/mesa/src/mapi/Makefile.in
index b2d93e719..2e618e655 100644
--- a/lib/mesa/src/mapi/Makefile.in
+++ b/lib/mesa/src/mapi/Makefile.in
@@ -438,6 +438,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mapi/glapi/gen/Makefile.in b/lib/mesa/src/mapi/glapi/gen/Makefile.in
index a6f3e8cb2..5d7fd5cb6 100644
--- a/lib/mesa/src/mapi/glapi/gen/Makefile.in
+++ b/lib/mesa/src/mapi/glapi/gen/Makefile.in
@@ -112,6 +112,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/Makefile.in b/lib/mesa/src/mesa/Makefile.in
index 6a048d7cb..a8d0bcf77 100644
--- a/lib/mesa/src/mesa/Makefile.in
+++ b/lib/mesa/src/mesa/Makefile.in
@@ -779,6 +779,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/Makefile.in b/lib/mesa/src/mesa/drivers/dri/Makefile.in
index 2c66c9f64..6923bd585 100644
--- a/lib/mesa/src/mesa/drivers/dri/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/Makefile.in
@@ -241,6 +241,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/common/Makefile.in b/lib/mesa/src/mesa/drivers/dri/common/Makefile.in
index fdf358280..a49bdc9b9 100644
--- a/lib/mesa/src/mesa/drivers/dri/common/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/common/Makefile.in
@@ -246,6 +246,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/common/xmlpool/Makefile.in b/lib/mesa/src/mesa/drivers/dri/common/xmlpool/Makefile.in
index 64f223012..95248ca2c 100644
--- a/lib/mesa/src/mesa/drivers/dri/common/xmlpool/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/common/xmlpool/Makefile.in
@@ -149,6 +149,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/i915/Makefile.in b/lib/mesa/src/mesa/drivers/dri/i915/Makefile.in
index ba2a07378..e02714e17 100644
--- a/lib/mesa/src/mesa/drivers/dri/i915/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/i915/Makefile.in
@@ -176,6 +176,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/i965/Makefile.in b/lib/mesa/src/mesa/drivers/dri/i965/Makefile.in
index cf71de472..2c1b13274 100644
--- a/lib/mesa/src/mesa/drivers/dri/i965/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/i965/Makefile.in
@@ -388,6 +388,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/nouveau/Makefile.in b/lib/mesa/src/mesa/drivers/dri/nouveau/Makefile.in
index 262629fa1..00abe492c 100644
--- a/lib/mesa/src/mesa/drivers/dri/nouveau/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/nouveau/Makefile.in
@@ -176,6 +176,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/r200/Makefile.in b/lib/mesa/src/mesa/drivers/dri/r200/Makefile.in
index ceb78f36c..03b5a1d06 100644
--- a/lib/mesa/src/mesa/drivers/dri/r200/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/r200/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/radeon/Makefile.in b/lib/mesa/src/mesa/drivers/dri/radeon/Makefile.in
index e4d64f192..e0b5e6683 100644
--- a/lib/mesa/src/mesa/drivers/dri/radeon/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/radeon/Makefile.in
@@ -173,6 +173,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/dri/swrast/Makefile.in b/lib/mesa/src/mesa/drivers/dri/swrast/Makefile.in
index 65ed888fe..8000212b5 100644
--- a/lib/mesa/src/mesa/drivers/dri/swrast/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/swrast/Makefile.in
@@ -164,6 +164,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/osmesa/Makefile.in b/lib/mesa/src/mesa/drivers/osmesa/Makefile.in
index 74a2aab40..dfd0f6dae 100644
--- a/lib/mesa/src/mesa/drivers/osmesa/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/osmesa/Makefile.in
@@ -222,6 +222,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/drivers/x11/Makefile.in b/lib/mesa/src/mesa/drivers/x11/Makefile.in
index 793f4fbcc..f819a7ac7 100644
--- a/lib/mesa/src/mesa/drivers/x11/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/x11/Makefile.in
@@ -224,6 +224,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/mesa/main/tests/Makefile.in b/lib/mesa/src/mesa/main/tests/Makefile.in
index 93d4e8566..dc0d9e611 100644
--- a/lib/mesa/src/mesa/main/tests/Makefile.in
+++ b/lib/mesa/src/mesa/main/tests/Makefile.in
@@ -170,6 +170,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/util/Makefile.in b/lib/mesa/src/util/Makefile.in
index d71a445b2..ad44f530c 100644
--- a/lib/mesa/src/util/Makefile.in
+++ b/lib/mesa/src/util/Makefile.in
@@ -239,6 +239,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/util/tests/hash_table/Makefile.in b/lib/mesa/src/util/tests/hash_table/Makefile.in
index 8fe9a1d7f..f57d20cda 100644
--- a/lib/mesa/src/util/tests/hash_table/Makefile.in
+++ b/lib/mesa/src/util/tests/hash_table/Makefile.in
@@ -237,6 +237,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/lib/mesa/src/vulkan/wsi/Makefile.in b/lib/mesa/src/vulkan/wsi/Makefile.in
index 2d566e759..9e0bb51a6 100644
--- a/lib/mesa/src/vulkan/wsi/Makefile.in
+++ b/lib/mesa/src/vulkan/wsi/Makefile.in
@@ -170,6 +170,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
 CLOCK_LIB = @CLOCK_LIB@
+CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
author	Jonathan Gray <jsg@cvs.openbsd.org>	2017-03-25 00:29:31 +0000
committer	Jonathan Gray <jsg@cvs.openbsd.org>	2017-03-25 00:29:31 +0000
commit	c83cf8802f5c955b3ff83408a0f5c41f63fcb415 (patch)
tree	23e00e49e6f2ceaae6e560f8ca02088ecd62c3bc /lib
parent	0ad866088a8e454456ac70baecf687d8a5d778c6 (diff)