mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-06-02 14:33:12 -04:00
Merge tag 'clang-fixes-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux
Pull clang build fix from Nathan Chancellor: "A small fix to disable -Wattribute-alias for clang in the few places it is already disabled for GCC, now that tip of tree clang has implemented -Wattribute-alias as GCC has" * tag 'clang-fixes-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux: Disable -Wattribute-alias for clang-23 and newer
This commit is contained in:
@@ -32,6 +32,10 @@ asmlinkage long __riscv_sys_ni_syscall(const struct pt_regs *);
|
||||
__diag_push(); \
|
||||
__diag_ignore(GCC, 8, "-Wattribute-alias", \
|
||||
"Type aliasing is used to sanitize syscall arguments"); \
|
||||
__diag_ignore(clang, 23, "-Wunknown-warning-option", \
|
||||
"Avoid breaking versions without -Wattribute-alias"); \
|
||||
__diag_ignore(clang, 23, "-Wattribute-alias", \
|
||||
"Type aliasing is used to sanitize syscall arguments"); \
|
||||
static long __se_##prefix##name(ulong, ulong, ulong, ulong, ulong, ulong, \
|
||||
ulong) \
|
||||
__attribute__((alias(__stringify(___se_##prefix##name)))); \
|
||||
|
||||
@@ -72,6 +72,10 @@
|
||||
__diag_push(); \
|
||||
__diag_ignore(GCC, 8, "-Wattribute-alias", \
|
||||
"Type aliasing is used to sanitize syscall arguments");\
|
||||
__diag_ignore(clang, 23, "-Wunknown-warning-option", \
|
||||
"Avoid breaking versions without -Wattribute-alias"); \
|
||||
__diag_ignore(clang, 23, "-Wattribute-alias", \
|
||||
"Type aliasing is used to sanitize syscall arguments"); \
|
||||
asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
|
||||
__attribute__((alias(__stringify(__se_compat_sys##name)))); \
|
||||
ALLOW_ERROR_INJECTION(compat_sys##name, ERRNO); \
|
||||
|
||||
@@ -131,6 +131,12 @@
|
||||
#define __diag_str(s) __diag_str1(s)
|
||||
#define __diag(s) _Pragma(__diag_str(clang diagnostic s))
|
||||
|
||||
#if CONFIG_CLANG_VERSION >= 230000
|
||||
#define __diag_clang_23(s) __diag(s)
|
||||
#else
|
||||
#define __diag_clang_23(s)
|
||||
#endif
|
||||
|
||||
#define __diag_clang_13(s) __diag(s)
|
||||
|
||||
#define __diag_ignore_all(option, comment) \
|
||||
|
||||
@@ -711,6 +711,10 @@ struct ftrace_likely_data {
|
||||
#define __diag_GCC(version, severity, string)
|
||||
#endif
|
||||
|
||||
#ifndef __diag_clang
|
||||
#define __diag_clang(version, severity, string)
|
||||
#endif
|
||||
|
||||
#define __diag_push() __diag(push)
|
||||
#define __diag_pop() __diag(pop)
|
||||
|
||||
|
||||
@@ -247,6 +247,10 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)
|
||||
__diag_push(); \
|
||||
__diag_ignore(GCC, 8, "-Wattribute-alias", \
|
||||
"Type aliasing is used to sanitize syscall arguments");\
|
||||
__diag_ignore(clang, 23, "-Wunknown-warning-option", \
|
||||
"Avoid breaking versions without -Wattribute-alias");\
|
||||
__diag_ignore(clang, 23, "-Wattribute-alias", \
|
||||
"Type aliasing is used to sanitize syscall arguments");\
|
||||
asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
|
||||
__attribute__((alias(__stringify(__se_sys##name)))); \
|
||||
ALLOW_ERROR_INJECTION(sys##name, ERRNO); \
|
||||
|
||||
Reference in New Issue
Block a user