On 08.09.2018 14:24, 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 actually fixes Clang support for ARM32, it fixes: 815f0ddb346c
("include/linux/compiler*.h: make compiler-*.h mutually exclusive").

So this should go in v4.19. Is this patch set (patches 5/6 in
particular) planned for v4.19? If not, we probably have to split out
this fix...

--
Stefan

> Cc: Rasmus Villemoes <li...@rasmusvillemoes.dk>
> Cc: Luc Van Oostenryck <luc.vanoostenr...@gmail.com>
> 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: Nick Desaulniers <ndesaulni...@google.com>
> Cc: Linus Torvalds <torva...@linux-foundation.org>
> Cc: linux-spa...@vger.kernel.org
> Suggested-by: Arnd Bergmann <a...@arndb.de>
> Signed-off-by: Miguel Ojeda <miguel.ojeda.sando...@gmail.com>
> ---
>  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 4cd5e9264bce..3b32bbfa5a49 100644
> --- a/include/linux/compiler-gcc.h
> +++ b/include/linux/compiler-gcc.h
> @@ -72,14 +72,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 __compiletime_object_size(obj) __builtin_object_size(obj, 0)
> diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
> index 83475515bc39..5ff9cda893f4 100644
> --- a/include/linux/compiler_types.h
> +++ b/include/linux/compiler_types.h
> @@ -224,6 +224,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)
>  
>  /*

Reply via email to