On 13.09.2018 16:59, Miguel Ojeda wrote:
> The naked attribute is supported by at least gcc >= 4.6 (for ARM,
> which is the only current user), gcc >= 8 (for x86), clang >= 3.1
> and icc >= 13. See https://godbolt.org/z/350Dyc
>
> Therefore, move it out of compiler-gcc.h so that the definition
> is shared by all compilers.
>
> This also fixes Clang support for ARM32 --- 815f0ddb346c
> ("include/linux/compiler*.h: make compiler-*.h mutually exclusive").
>
> Cc: Stefan Agner <ste...@agner.ch>
> Cc: Rasmus Villemoes <li...@rasmusvillemoes.dk>
> Cc: Eli Friedman <efrie...@codeaurora.org>
> Cc: Christopher Li <spa...@chrisli.org>
> Cc: Kees Cook <keesc...@chromium.org>
> Cc: Ingo Molnar <mi...@kernel.org>
> Cc: Geert Uytterhoeven <ge...@linux-m68k.org>
> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
> Cc: Masahiro Yamada <yamada.masah...@socionext.com>
> Cc: Joe Perches <j...@perches.com>
> Cc: Dominique Martinet <asmad...@codewreck.org>
> Cc: Linus Torvalds <torva...@linux-foundation.org>
> Cc: linux-spa...@vger.kernel.org
> Suggested-by: Arnd Bergmann <a...@arndb.de>
> Reviewed-by: Luc Van Oostenryck <luc.vanoostenr...@gmail.com>
> Reviewed-by: Nick Desaulniers <ndesaulni...@google.com>
> Signed-off-by: Miguel Ojeda <miguel.ojeda.sando...@gmail.com>
Reviewed-by: Stefan Agner <ste...@agner.ch>
Ideally this two patches should go into v4.19. Not sure which path the patch
should take, MAINTAINERS is not quite clear about that. This fixes 815f0ddb346c
("include/linux/compiler*.h: make compiler-*.h mutually exclusive") for ARM32,
which has been merged directly by
Linus, afaict...
--
Stefan
> ---
> include/linux/compiler-gcc.h | 8 --------
> include/linux/compiler_types.h | 8 ++++++++
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
> index 25d3dd6b2702..4d36b27214fd 100644
> --- a/include/linux/compiler-gcc.h
> +++ b/include/linux/compiler-gcc.h
> @@ -79,14 +79,6 @@
> #define __noretpoline __attribute__((indirect_branch("keep")))
> #endif
>
> -/*
> - * it doesn't make sense on ARM (currently the only user of __naked)
> - * to trace naked functions because then mcount is called without
> - * stack and frame pointer being set up and there is no chance to
> - * restore the lr register to the value before mcount was called.
> - */
> -#define __naked __attribute__((naked)) notrace
> -
> #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix),
> __COUNTER__)
>
> #define __optimize(level) __attribute__((__optimize__(level)))
> diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
> index 3525c179698c..db192becfec4 100644
> --- a/include/linux/compiler_types.h
> +++ b/include/linux/compiler_types.h
> @@ -226,6 +226,14 @@ struct ftrace_likely_data {
> #define notrace __attribute__((no_instrument_function))
> #endif
>
> +/*
> + * it doesn't make sense on ARM (currently the only user of __naked)
> + * to trace naked functions because then mcount is called without
> + * stack and frame pointer being set up and there is no chance to
> + * restore the lr register to the value before mcount was called.
> + */
> +#define __naked __attribute__((naked)) notrace
> +
> #define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
>
> /*
