diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 09:23:43 +0300 | 
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 09:23:43 +0300 | 
| commit | 16ecf49c10a1e8ecf917f91b93dd85624349e930 (patch) | |
| tree | f05d0a17219ae9173c45deee57b06e807632c6d0 /include/linux/compiler-gcc.h | |
| parent | 708d0bff9121506db08adb73845a3c70312fadf3 (diff) | |
| parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
| download | linux-16ecf49c10a1e8ecf917f91b93dd85624349e930.tar.xz | |
Merge 4.18-rc3 into tty-next
We want ths tty core changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/compiler-gcc.h')
| -rw-r--r-- | include/linux/compiler-gcc.h | 25 | 
1 files changed, 25 insertions, 0 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index f1a7492a5cc8..fd282c7d3e5e 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -347,3 +347,28 @@  #if GCC_VERSION >= 50100  #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1  #endif + +/* + * Turn individual warnings and errors on and off locally, depending + * on version. + */ +#define __diag_GCC(version, severity, s) \ +	__diag_GCC_ ## version(__diag_GCC_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_GCC_ignore	ignored +#define __diag_GCC_warn		warning +#define __diag_GCC_error	error + +/* Compilers before gcc-4.6 do not understand "#pragma GCC diagnostic push" */ +#if GCC_VERSION >= 40600 +#define __diag_str1(s)		#s +#define __diag_str(s)		__diag_str1(s) +#define __diag(s)		_Pragma(__diag_str(GCC diagnostic s)) +#endif + +#if GCC_VERSION >= 80000 +#define __diag_GCC_8(s)		__diag(s) +#else +#define __diag_GCC_8(s) +#endif  | 
