From patchwork Thu Jun 7 20:49:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10453565 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 922F360467 for ; Thu, 7 Jun 2018 20:50:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F3CD2945E for ; Thu, 7 Jun 2018 20:50:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7182B299EF; Thu, 7 Jun 2018 20:50:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92E6E299E9 for ; Thu, 7 Jun 2018 20:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932593AbeFGUuB (ORCPT ); Thu, 7 Jun 2018 16:50:01 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:35315 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932594AbeFGUt4 (ORCPT ); Thu, 7 Jun 2018 16:49:56 -0400 Received: by mail-pl0-f65.google.com with SMTP id i5-v6so6876646plt.2 for ; Thu, 07 Jun 2018 13:49:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ajVCbUL1zYj2BBf5z9RQTGIReuirO/b3dkFEYOD35rI=; b=V20V+yVHGYpEkfVaydTdIsMX7c7IGW4jOk2/8ABLMLP+8TlPzkZqSr2XqIXu+UBOlP 9IchrQ11tzYidl3dQfVmCscwlymyIFQ7pmNNP2tJT8J5rbr4uJHZGqyhHjL8d8Kfrg0e zAPrzowv3+G0muqRC9azojfqxpkvgAq4QjzT4c83XYlD4VkGdW0LkD9GZO44YmPy9/uy SPzfxku9l/8R6omD4H239ZNGTFgj9BLakFDcQCitYxsIKEBroyoUKbcFSzbuQ1R48iZp ZFIUnucZaVFbV8BqtkN80nCLkFZs/1ndRpukSUhTkGqEqJkUejcENk/29PvKvEvfqiFY P4GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ajVCbUL1zYj2BBf5z9RQTGIReuirO/b3dkFEYOD35rI=; b=YZzUP5Gf3YulfHIppOxLxhCZRllfwoTDUDHG3wMEcXgShMRDJWBEQvGNgEVroNPk30 GyN80VXCHXiBtGo/HCcS63XCHcR+rEeYPWx9BVT/UQYe+DcOl44hl69CuxHpdQd7QG8j O14Od2AN5xxbKdkxSNLUkWvgznm2EN+TcdZKDgVkXpTt4/ntBS+nqvDA/BVX3WLEFtMV iPKBnHEPDTS33MeeUFQkH8jcKTwKXdQHzSCIj8oV/ryxY193htP3TnT3VbF9V5pyrLcL cDQbFT3NMXv6yvWMKvndMoAbr58OiJSlkx+RWoNS/kkviwNqGUbtjBP27T1PqPCSAtQi ODUA== X-Gm-Message-State: APt69E1VYJrbCAOsGDeZ63NFwL0Fsf6FtoG6f3d+hLSM5XP8cbL5sN5H OF+i22bdtzuFAeYkxo/AstyFpA== X-Google-Smtp-Source: ADUXVKKCVX5k5PfIrdPgPZaONkYeybz79QviaRAg6O99cn2EmCpjOx5EKKynoeglrBIWrO2wnPd7Bw== X-Received: by 2002:a17:902:1e2:: with SMTP id b89-v6mr3531386plb.279.1528404595523; Thu, 07 Jun 2018 13:49:55 -0700 (PDT) Received: from ndesaulniers0.svl.corp.google.com ([2620:15c:2a3:1:d33:166f:5b79:14b3]) by smtp.gmail.com with ESMTPSA id w18-v6sm3780460pgq.1.2018.06.07.13.49.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 13:49:54 -0700 (PDT) From: Nick Desaulniers To: akpm@linux-foundation.org, hpa@zytor.com, mingo@redhat.com, tglx@linutronix.de Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, virtualization@lists.linux-foundation.org, astrachan@google.com, manojgupta@google.com, ghackmann@google.com, sedat.dilek@gmail.com, tstellar@redhat.com, keescook@google.com, yamada.masahiro@socionext.com, michal.lkml@markovi.net, linux-kbuild@vger.kernel.org, geert@linux-m68k.org, will.deacon@arm.com, mawilcox@microsoft.com, arnd@arndb.de, rientjes@google.com, acme@redhat.com, pombredanne@nexb.com, aryabinin@virtuozzo.com, kstewart@linuxfoundation.org, boris.ostrovsky@oracle.com, jan.kiszka@siemens.com, rostedt@goodmis.org, kirill.shutemov@linux.intel.com, ard.biesheuvel@linaro.org, akataria@vmware.com, brijesh.singh@amd.com, caoj.fnst@cn.fujitsu.com, gregkh@linuxfoundation.org, jarkko.sakkinen@linux.intel.com, jgross@suse.com, jpoimboe@redhat.com, mka@chromium.org, ndesaulniers@google.com, thomas.lendacky@amd.com, tweek@google.com, mjg59@google.com, joe@perches.com Subject: [PATCH v4 1/3] compiler-gcc.h: add gnu_inline to all inline declarations Date: Thu, 7 Jun 2018 13:49:25 -0700 Message-Id: <20180607204927.219329-2-ndesaulniers@google.com> X-Mailer: git-send-email 2.17.1.1185.g55be947832-goog In-Reply-To: <20180607204927.219329-1-ndesaulniers@google.com> References: <20180607204927.219329-1-ndesaulniers@google.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Nick Desaulniers Suggested-by: H. Peter Anvin Suggested-by: Joe Perches --- include/linux/compiler-gcc.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index b4bf73f5e38f..0c79c588e572 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -72,19 +72,22 @@ * -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, gnu_inline)) notrace #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, gnu_inline)) notrace #endif +#define __inline__ inline +#define __inline inline #define __always_inline inline __attribute__((always_inline)) #define noinline __attribute__((noinline))