| Index: third_party/mesa/mesa.gyp
 | 
| diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
 | 
| index 056eb40fb308384686f49a7e47135b51709dd7bb..3db0d4c71e53ac574a16644bb6eacfe8b586087a 100644
 | 
| --- a/third_party/mesa/mesa.gyp
 | 
| +++ b/third_party/mesa/mesa.gyp
 | 
| @@ -132,6 +132,7 @@
 | 
|        'variables': {
 | 
|          'clang_warning_flags': [
 | 
|            '-Wno-tautological-constant-out-of-range-compare',
 | 
| +          '-Wno-mismatched-tags',  # Fixed upstream.
 | 
|          ],
 | 
|          'clang_warning_flags_unset': [
 | 
|            # Don't warn about string->bool used in asserts.
 | 
| @@ -269,6 +270,8 @@
 | 
|        'variables': {
 | 
|          'clang_warning_flags': [
 | 
|            '-Wno-tautological-constant-out-of-range-compare',
 | 
| +          '-Wno-absolute-value',  # Fires on st_atom_array.c, might be a bug
 | 
| +          '-Wno-mismatched-tags',  # Fixed upstream.
 | 
|          ],
 | 
|          'clang_warning_flags_unset': [
 | 
|            # Don't warn about string->bool used in asserts.
 | 
| 
 |