Index: head/multimedia/gmmlib/files/patch-gcc-atomics
===================================================================
--- head/multimedia/gmmlib/files/patch-gcc-atomics	(revision 485569)
+++ head/multimedia/gmmlib/files/patch-gcc-atomics	(revision 485570)
@@ -1,82 +1,107 @@
 __sync* are GCC/Clang atomic builtins supported on any platform
 
+In file included from Source/GmmLib/Platform/GmmGen11Platform.cpp:23:
+In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:35:
+In file included from Source/GmmLib/inc/External/Common/GmmCachePolicy.h:332:
+Source/GmmLib/inc/External/Common/GmmCachePolicyCommon.h:74:13: error: control reaches end of non-void function [-Werror,-Wreturn-type]
+            }
+            ^
+In file included from Source/GmmLib/Platform/GmmGen11Platform.cpp:23:
+In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:38:
+Source/GmmLib/inc/../Platform/GmmPlatforms.h:86:9: error: control reaches end of non-void function [-Werror,-Wreturn-type]
+        }
+        ^
+In file included from Source/GmmLib/Platform/GmmGen11Platform.cpp:23:
+In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:42:
+In file included from Source/GmmLib/inc/../Texture/GmmTexture.h:27:
+In file included from Source/GmmLib/inc/External/Common/GmmInfoExt.h:25:
+Source/GmmLib/inc/External/Common/GmmInfo.h:134:9: error: control reaches end of non-void function [-Werror,-Wreturn-type]
+        }
+        ^
+In file included from Source/GmmLib/CachePolicy/GmmGen11CachePolicy.cpp:23:
+In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:42:
+In file included from Source/GmmLib/inc/../Texture/GmmTexture.h:31:
+Source/GmmLib/inc/Internal/Common/Texture/GmmTextureCalc.h:163:13: error: control reaches end of non-void function [-Werror,-Wreturn-type]
+            }
+            ^
+
 --- Source/GmmLib/Platform/GmmPlatforms.h.orig	2018-09-28 18:59:39 UTC
 +++ Source/GmmLib/Platform/GmmPlatforms.h
 @@ -69,7 +69,7 @@ namespace GmmLib {
          {
  #if defined(__GMM_KMD__) || _WIN32
              InterlockedIncrement((LONG *)&RefCount);
 -#elif defined(__linux__)
 +#elif defined(__GNUC__)
              __sync_fetch_and_add(&RefCount, 1);
  #endif
              //TODO[Android]
 @@ -79,7 +79,7 @@ namespace GmmLib {
          {
  #if defined(__GMM_KMD__) || _WIN32
              return(InterlockedDecrement((LONG *)&RefCount));
 -#elif defined(__linux__)
 +#elif defined(__GNUC__)
              return(__sync_sub_and_fetch(&RefCount, 1));
  #endif
              //TODO[Android]
 --- Source/GmmLib/inc/External/Common/GmmCachePolicyCommon.h.orig	2018-09-28 18:59:39 UTC
 +++ Source/GmmLib/inc/External/Common/GmmCachePolicyCommon.h
 @@ -57,7 +57,7 @@ namespace GmmLib
              {
                  #if defined(__GMM_KMD__) || _WIN32
                      InterlockedIncrement((LONG *)&RefCount);
 -                #elif defined(__linux__)
 +                #elif defined(__GNUC__)
                      __sync_fetch_and_add(&RefCount, 1);
                  #endif
                  //TODO[Android]
 @@ -67,7 +67,7 @@ namespace GmmLib
              {
                  #if defined(__GMM_KMD__) || _WIN32
                      return(InterlockedDecrement((LONG *)&RefCount));
 -                #elif defined(__linux__)
 +                #elif defined(__GNUC__)
                      return(__sync_sub_and_fetch(&RefCount, 1));
                  #endif
                  //TODO[Android]
 --- Source/GmmLib/inc/External/Common/GmmInfo.h.orig	2018-09-28 18:59:39 UTC
 +++ Source/GmmLib/inc/External/Common/GmmInfo.h
 @@ -128,7 +128,7 @@ namespace GmmLib
          {
  #if defined(_WIN32)
              return(InterlockedIncrement((LONG *)&RefCount) - 1);  //InterLockedIncrement() returns incremented value
 -#elif defined(__linux__)
 +#elif defined(__GNUC__)
              return(__sync_fetch_and_add(&RefCount, 1));
  #endif
          }
 @@ -150,7 +150,7 @@ namespace GmmLib
                  }
  #if defined(_WIN32)
              } while (!(InterlockedCompareExchange((LONG *)&RefCount, TargetValue, CurrentValue) == CurrentValue));
 -#elif defined(__linux__)
 +#elif defined(__GNUC__)
              } while (!__sync_bool_compare_and_swap(&RefCount, CurrentValue, TargetValue));
  #endif
  
 --- Source/GmmLib/inc/Internal/Common/Texture/GmmTextureCalc.h.orig	2018-09-28 18:59:39 UTC
 +++ Source/GmmLib/inc/Internal/Common/Texture/GmmTextureCalc.h
 @@ -146,7 +146,7 @@ namespace GmmLib
              {
                  #if defined(__GMM_KMD__) || _WIN32
                      InterlockedIncrement((LONG *)&RefCount);
 -                #elif defined(__linux__)
 +                #elif defined(__GNUC__)
                      __sync_fetch_and_add(&RefCount, 1);
                  #endif
                      //TODO[Android]
 @@ -156,7 +156,7 @@ namespace GmmLib
              {
                  #if defined(__GMM_KMD__) || _WIN32
                      return(InterlockedDecrement((LONG *)&RefCount));
 -                #elif defined(__linux__)
 +                #elif defined(__GNUC__)
                      return(__sync_sub_and_fetch(&RefCount, 1));
                  #endif
                      //TODO[Android]
Index: head/multimedia/gmmlib/files/patch-limits
===================================================================
--- head/multimedia/gmmlib/files/patch-limits	(revision 485569)
+++ head/multimedia/gmmlib/files/patch-limits	(revision 485570)
@@ -1,14 +1,16 @@
+<linux/limits.h> is implicitly included via <limits.h> but not required here
+
 Source/GmmLib/Utility/GmmLog/GmmLog.cpp:36:10: fatal error: 'linux/limits.h' file not found
 #include <linux/limits.h>
          ^~~~~~~~~~~~~~~~
 
 --- Source/GmmLib/Utility/GmmLog/GmmLog.cpp.orig	2018-09-28 18:59:39 UTC
 +++ Source/GmmLib/Utility/GmmLog/GmmLog.cpp
 @@ -33,7 +33,6 @@ OTHER DEALINGS IN THE SOFTWARE.
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fstream>
 -#include <linux/limits.h>
  #endif
  
  /// Logger instance shared by all of GmmLib within a process