4.17-stable review patch. If anyone has any objections, please let me know.
------------------ From: Nick Desaulniers <ndesaulni...@google.com> commit d03db2bc26f0e4a6849ad649a09c9c73fccdc656 upstream. Functions marked extern inline do not emit an externally visible function when the gnu89 C standard is used. Some KBUILD Makefiles overwrite KBUILD_CFLAGS. This is an issue for GCC 5.1+ users as without an explicit C standard specified, the default is gnu11. Since c99, the semantics of extern inline have changed such that an externally visible function is always emitted. This can lead to multiple definition errors of extern inline functions at link time of compilation units whose build files have removed an explicit C standard compiler flag for users of GCC 5.1+ or Clang. Suggested-by: Arnd Bergmann <a...@arndb.de> Suggested-by: H. Peter Anvin <h...@zytor.com> Suggested-by: Joe Perches <j...@perches.com> Signed-off-by: Nick Desaulniers <ndesaulni...@google.com> Acked-by: Juergen Gross <jgr...@suse.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: a...@redhat.com Cc: akata...@vmware.com Cc: a...@linux-foundation.org Cc: andrea.pa...@amarulasolutions.com Cc: ard.biesheu...@linaro.org Cc: aryabi...@virtuozzo.com Cc: astrac...@google.com Cc: boris.ostrov...@oracle.com Cc: brijesh.si...@amd.com Cc: caoj.f...@cn.fujitsu.com Cc: ge...@linux-m68k.org Cc: ghackm...@google.com Cc: gre...@linuxfoundation.org Cc: jan.kis...@siemens.com Cc: jarkko.sakki...@linux.intel.com Cc: jpoim...@redhat.com Cc: keesc...@google.com Cc: kirill.shute...@linux.intel.com Cc: kstew...@linuxfoundation.org Cc: linux-...@vger.kernel.org Cc: linux-kbu...@vger.kernel.org Cc: manojgu...@google.com Cc: mawil...@microsoft.com Cc: michal.l...@markovi.net Cc: mj...@google.com Cc: m...@chromium.org Cc: pombreda...@nexb.com Cc: rient...@google.com Cc: rost...@goodmis.org Cc: sedat.di...@gmail.com Cc: thomas.lenda...@amd.com Cc: tstel...@redhat.com Cc: tw...@google.com Cc: virtualizat...@lists.linux-foundation.org Cc: will.dea...@arm.com Cc: yamada.masah...@socionext.com Link: http://lkml.kernel.org/r/20180621162324.36656-2-ndesaulni...@google.com Signed-off-by: Ingo Molnar <mi...@kernel.org> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- include/linux/compiler-gcc.h | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -66,25 +66,40 @@ #endif /* + * Feature detection for gnu_inline (gnu89 extern inline semantics). Either + * __GNUC_STDC_INLINE__ is defined (not using gnu89 extern inline semantics, + * and we opt in to the gnu89 semantics), or __GNUC_STDC_INLINE__ is not + * defined so the gnu89 semantics are the default. + */ +#ifdef __GNUC_STDC_INLINE__ +# define __gnu_inline __attribute__((gnu_inline)) +#else +# define __gnu_inline +#endif + +/* * Force always-inline if the user requests it so via the .config, * or if gcc is too old. * GCC does not warn about unused static inline functions for * -Wunused-function. This turns out to avoid the need for complex #ifdef * directives. Suppress the warning in clang as well by using "unused" * function attribute, which is redundant but not harmful for gcc. + * Prefer gnu_inline, so that extern inline functions do not emit an + * externally visible function. This makes extern inline behave as per gnu89 + * semantics rather than c99. This prevents multiple symbol definition errors + * of extern inline functions at link time. + * A lot of inline functions can cause havoc with function tracing. */ #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) -#define inline inline __attribute__((always_inline,unused)) notrace -#define __inline__ __inline__ __attribute__((always_inline,unused)) notrace -#define __inline __inline __attribute__((always_inline,unused)) notrace +#define inline \ + inline __attribute__((always_inline, unused)) notrace __gnu_inline #else -/* A lot of inline functions can cause havoc with function tracing */ -#define inline inline __attribute__((unused)) notrace -#define __inline__ __inline__ __attribute__((unused)) notrace -#define __inline __inline __attribute__((unused)) notrace +#define inline inline __attribute__((unused)) notrace __gnu_inline #endif +#define __inline__ inline +#define __inline inline #define __always_inline inline __attribute__((always_inline)) #define noinline __attribute__((noinline))
