Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	src/mesa/drivers/dri/unichrome/via_ioctl.c
	src/mesa/drivers/dri/unichrome/via_screen.c
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom.c

diff --combined src/mesa/main/compiler.h
index 87c3b2e,a296404..4eb249b
--- 1/src/mesa/main/compiler.h
--- 2/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@@ -107,7 -107,8 +107,7 @@@ extern "C" 
  /**
   * finite macro.
   */
 -#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
 -#  define __WIN32__
 +#if defined(_MSC_VER)
  #  define finite _finite
  #elif defined(__WATCOMC__)
  #  define finite _finite
@@@ -234,7 -235,7 +234,7 @@@
  #elif defined(__APPLE__)
  #include <CoreFoundation/CFByteOrder.h>
  #define CPU_TO_LE32( x )      CFSwapInt32HostToLittle( x )
- #elif defined(_AIX)
+ #elif (defined(_AIX) || defined(__blrts))
  #define CPU_TO_LE32( x )        x = ((x & 0x000000ff) << 24) | \
                                      ((x & 0x0000ff00) <<  8) | \
                                      ((x & 0x00ff0000) >>  8) | \