From patchwork Fri Jan 22 14:12:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 368651 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1747105jam; Fri, 22 Jan 2021 10:21:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQ9apUT0ycDkB4JLy/khWNIAc4om1c9B2pLsIuO5e7Ohmzs5ZClII0bo2tsdtSN/dRTSs3 X-Received: by 2002:a17:906:828a:: with SMTP id h10mr3936301ejx.274.1611339665392; Fri, 22 Jan 2021 10:21:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611339665; cv=none; d=google.com; s=arc-20160816; b=znM+7JWXtFTf6TMECj0OrcxWYYG5LyQ+QXTsraQd/HUqh7LxvdPgACUIxF4BFCv8YK IN3iHnMajPtSNWE40fVN/eg95YBJsxFX7+9esa9EfBvNXbGgxo2yF38QODJ0107aeh3p 9tQaR5/d+22xLGgHJCmbXxSbj6LJ/2f3LFeuGeNCxRBTTcTjSaKTvHnjGp6l0s3VXyy4 eUWkzYo2mOAwdqlj12lzLojim+0lf/9NGrd9DO0O/zPzJLQ4EcW5y66kxRar1ORuwzP2 nAVFdpyZU4ywtxOI38Ax1weUYvL748qVGsYQkZHkTWAvc98bd7v9t8raN6tYdRi5Lf9O DSBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OyosjFD+nG4+cZ9XGUWnMvaGzy2W+8ZywjyRT1tWz94=; b=V4Kib1KfcuaLsaBe5pVUAagL/2mFbh3cp+MgCSR7NnK29guKIW/V8zP2WuTgtKvL5h 6xEPqYCtrOB3NiTs3nh619dRHSEcse6Fht/jZJszpZkWWVdnSMR5BX62YbVht2zj3F4J TBn1TsOwJFHQqCTTid/1Q+duhjElxvDuwsOuveB/GiOdhcJikMGf6ypZtgy957GWO5Hw 6LvNqnYqhZFcAKsPhFHAbIBZNDkNCMiHY1RRvQ+epCPv3NJrbbG7t1SyS+WY+PWZLs+4 pNKid59NhtMIdQi9TTrbz2x9yum0P9U+aFzBp6A/jmU/tZV7yn8XnrMd6wXC1URwvvZr exWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VmMAAGHj; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r7si3269192ejx.5.2021.01.22.10.20.56; Fri, 22 Jan 2021 10:21:05 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VmMAAGHj; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728922AbhAVSUT (ORCPT + 13 others); Fri, 22 Jan 2021 13:20:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:39962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728568AbhAVOXA (ORCPT ); Fri, 22 Jan 2021 09:23:00 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5771123B70; Fri, 22 Jan 2021 14:16:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1611325013; bh=2unsYnbqU3VXbkIxy0M8gfwixFW5ttWx8J23aoYZiHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VmMAAGHjvP3A32fZUAYDPkfVOu0rEaL87xKBSml9pVNFUzV7JAGAjpNkYrlqqAahm rkNKhzW6Us7hdbMswy22O6H8gfwYQa4Pm5a9xZFS4nqIbX1xGFTUhJiBKn2qQbW2rN HpJoglTt3Y3Na+3uqO1eL1Jy9GDylAGCc5yQghtk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Nathan Chancellor , Nick Desaulniers , Barret Rhoden , Andrew Morton , Linus Torvalds , Jian Cai Subject: [PATCH 5.4 04/33] elfcore: fix building with clang Date: Fri, 22 Jan 2021 15:12:20 +0100 Message-Id: <20210122135733.751633696@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210122135733.565501039@linuxfoundation.org> References: <20210122135733.565501039@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 6e7b64b9dd6d96537d816ea07ec26b7dedd397b9 upstream. kernel/elfcore.c only contains weak symbols, which triggers a bug with clang in combination with recordmcount: Cannot find symbol for section 2: .text. kernel/elfcore.o: failed Move the empty stubs into linux/elfcore.h as inline functions. As only two architectures use these, just use the architecture specific Kconfig symbols to key off the declaration. Link: https://lkml.kernel.org/r/20201204165742.3815221-2-arnd@kernel.org Signed-off-by: Arnd Bergmann Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Barret Rhoden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Jian Cai Signed-off-by: Greg Kroah-Hartman --- include/linux/elfcore.h | 22 ++++++++++++++++++++++ kernel/Makefile | 1 - kernel/elfcore.c | 26 -------------------------- 3 files changed, 22 insertions(+), 27 deletions(-) --- a/include/linux/elfcore.h +++ b/include/linux/elfcore.h @@ -58,6 +58,7 @@ static inline int elf_core_copy_task_xfp } #endif +#if defined(CONFIG_UM) || defined(CONFIG_IA64) /* * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out * extra segments containing the gate DSO contents. Dumping its @@ -72,5 +73,26 @@ elf_core_write_extra_phdrs(struct coredu extern int elf_core_write_extra_data(struct coredump_params *cprm); extern size_t elf_core_extra_data_size(void); +#else +static inline Elf_Half elf_core_extra_phdrs(void) +{ + return 0; +} + +static inline int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset) +{ + return 1; +} + +static inline int elf_core_write_extra_data(struct coredump_params *cprm) +{ + return 1; +} + +static inline size_t elf_core_extra_data_size(void) +{ + return 0; +} +#endif #endif /* _LINUX_ELFCORE_H */ --- a/kernel/Makefile +++ b/kernel/Makefile @@ -93,7 +93,6 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayac obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o obj-$(CONFIG_TRACEPOINTS) += tracepoint.o obj-$(CONFIG_LATENCYTOP) += latencytop.o -obj-$(CONFIG_ELFCORE) += elfcore.o obj-$(CONFIG_FUNCTION_TRACER) += trace/ obj-$(CONFIG_TRACING) += trace/ obj-$(CONFIG_TRACE_CLOCK) += trace/ --- a/kernel/elfcore.c +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include - -Elf_Half __weak elf_core_extra_phdrs(void) -{ - return 0; -} - -int __weak elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset) -{ - return 1; -} - -int __weak elf_core_write_extra_data(struct coredump_params *cprm) -{ - return 1; -} - -size_t __weak elf_core_extra_data_size(void) -{ - return 0; -}