diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-08-28 16:59:35 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-08-28 16:59:35 -0400 |
| commit | 928ce5e326ccd1b7456002c28f34975b5bc4b13f (patch) | |
| tree | 5706376fe74103223511f5a4954ce2dff0b08d0e /src/zig_llvm.cpp | |
| parent | 2f3ad48c9b35ccac377e710a4eee6b35f60b119f (diff) | |
| parent | e8a9caa3dd0aef7b745b8197afecec90598b2cdd (diff) | |
| download | zig-928ce5e326ccd1b7456002c28f34975b5bc4b13f.tar.gz zig-928ce5e326ccd1b7456002c28f34975b5bc4b13f.zip | |
Merge remote-tracking branch 'origin/master' into llvm9
Diffstat (limited to 'src/zig_llvm.cpp')
| -rw-r--r-- | src/zig_llvm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index 96be3344d9..4fe601aa8a 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -15,9 +15,9 @@ #include "zig_llvm.h" -#if __GNUC__ >= 8 +#if __GNUC__ >= 9 #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wclass-memaccess" +#pragma GCC diagnostic ignored "-Winit-list-lifetime" #endif #include <llvm/Analysis/TargetLibraryInfo.h> @@ -50,7 +50,7 @@ #include <lld/Common/Driver.h> -#if __GNUC__ >= 8 +#if __GNUC__ >= 9 #pragma GCC diagnostic pop #endif |