From patchwork Thu Jun 7 18:32:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10453391 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 F40B060146 for ; Thu, 7 Jun 2018 18:32:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E45FE29D12 for ; Thu, 7 Jun 2018 18:32:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D676F29D32; Thu, 7 Jun 2018 18:32:38 +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=ham 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 4D74629D12 for ; Thu, 7 Jun 2018 18:32:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936304AbeFGSch (ORCPT ); Thu, 7 Jun 2018 14:32:37 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:41901 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936300AbeFGSca (ORCPT ); Thu, 7 Jun 2018 14:32:30 -0400 Received: by mail-pl0-f66.google.com with SMTP id az12-v6so6654534plb.8 for ; Thu, 07 Jun 2018 11:32:30 -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=MUMzXIPVobfzmQROoZfwZH3wW3WGc0fqs5NqVBmHC34=; b=HvHAwbNPFcEOvzEnRGtInMDr7M6n/7+GqO50EJJCbwpANlYXNd/kiVlxK0w7wOjJx3 OenTnSXeIRSMTv4clXCFNiJARJra3TGUsIoYePHUD+lrfo8hm6tlsweAUJaXtEXUJ7HZ RnChLGfOv+/XK33clJwFmbfgNDybVLsz/v80tsRAPaqSr0N2weOPc0csOr0krVW2z1xy 1NwxTNRjsjuT0ooA5GBQD6/Hm0+SygjfJSf9lpm/4dOJcLxnVgymDA3ogGNhORMRDst7 yTVbJ/iZ9yK+gLgKw+8oizxQG4sVMVRGyCoeCDHYZHwldQqQpr0k/q8vGcepj4BDLhgK 4AsA== 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=MUMzXIPVobfzmQROoZfwZH3wW3WGc0fqs5NqVBmHC34=; b=DAtSJ4YLLA0Ve2LEklF+T8gE+Ou1GKg5VUzaRfZY1qcBHPvfCrXky7d9BCJzGwAohA l31HLzC7V3XfOq0GejB9r57InBtkvxH3coQQKgGKHAaoOuW00AgK6X/Se7bh1RCAXz6f zwO3FluUZY319wS9+kJsBlxfbFFQzRlNQRI0qIMznakCGt6IOrCYg4IwO0QBE7/4MRr+ +5nAi452xjPIl9GiiDTPKilSdsswh4WOmSbWw+HPfa+1KBQGX5yVeLRe6HkT3qZ+EhJz Tzm/8JXHZlEXSMRusPQvg+bq5K0OQsUBNxyclKaftEjOyU3440E1bJWXi5axzA41XBjt KGpA== X-Gm-Message-State: APt69E3j+08un3ARKaof3+f7AT40EpFJblUOXErDJjdAm+EkQqKQGi/u umzDqZiDr8ukMHl1L6OEsYDrKg== X-Google-Smtp-Source: ADUXVKLPH1t/wzUALw4J3gthqHaSh9sRbB8SIbtO/2fZqZ4wOXfqWnJDgoxJUlFtINrst3yojFKCvA== X-Received: by 2002:a17:902:2bc5:: with SMTP id l63-v6mr3053335plb.299.1528396349890; Thu, 07 Jun 2018 11:32:29 -0700 (PDT) Received: from ndesaulniers0.svl.corp.google.com ([2620:15c:2a3:1:d33:166f:5b79:14b3]) by smtp.gmail.com with ESMTPSA id n76-v6sm6932739pfg.98.2018.06.07.11.32.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 11:32:29 -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 v3 1/3] compiler-gcc.h: add gnu_inline to all inline declarations Date: Thu, 7 Jun 2018 11:32:17 -0700 Message-Id: <20180607183219.192973-2-ndesaulniers@google.com> X-Mailer: git-send-email 2.17.1.1185.g55be947832-goog In-Reply-To: <20180607183219.192973-1-ndesaulniers@google.com> References: <20180607183219.192973-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, 11 insertions(+), 6 deletions(-) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index b4bf73f5e38f..3365f20dba5a 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -72,17 +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. */ #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 +#define __inline__ inline +#define __inline 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, gnu_inline)) notrace +#define __inline__ inline +#define __inline inline #endif #define __always_inline inline __attribute__((always_inline))