diff --git a/CMakeLists.txt b/CMakeLists.txt
index 087a6d7..5fae661 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,6 +339,15 @@
         "-Wmissing-braces"
     )
 
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8)
+            list(APPEND SWIFTSHADER_COMPILE_OPTIONS
+                # Warnings that should not be treated as errors:
+                "-Wno-error=class-memaccess"  # TODO(b/134932616): Reliably initializing cache keys currently requires memset().
+            )
+        endif()
+    endif()
+
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         list(APPEND SWIFTSHADER_COMPILE_OPTIONS
             "-Wunused-lambda-capture"
diff --git a/src/Device/LRUCache.hpp b/src/Device/LRUCache.hpp
index 4fc3561..487d2a7 100644
--- a/src/Device/LRUCache.hpp
+++ b/src/Device/LRUCache.hpp
@@ -48,7 +48,7 @@
 	};
 
 	// Helper class for clearing the memory of objects at construction.
-	// Useful as the first base class or cache keys which may contain padding bytes or bits otherwise left uninitialized.
+	// Useful as the first base class of cache keys which may contain padding bytes or bits otherwise left uninitialized.
 	template<class T>
 	struct Memset
 	{