From patchwork Fri Nov 17 12:56:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13458930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5FAE6C197A0 for ; Fri, 17 Nov 2023 12:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=N7JH3rSEvQfFzPrHn0wRPphiME8SnguTi68zamJx0dg=; b=WIIwdrf06m4slN yd1EyoZ6zAruQ4TVy2V0p22oD8eephuQvqHPWdBWRZxf3+9XaYub9tsve6dHgG0mAS6Qs2qibC9+u uC4esvS8BwpJ21H+qCq7iJwRz+9WQANT8W4JtgJR2ocrMHbEkGPJIM11OvNYwlEpXfTQu/A/Go7Sm CzCefm+I4WXzLFgKO/vdcbYN3Sd2aE/rUgH5yy6Okl+U77C5MZzNEQSgnQvrjIe3qJv+Q7sOcvkzJ xMHd7bwVmkQO2uzerPCxYMvJiyYoVBCfYFolSa3j8lUBWdtvqUKFetSimTYfXUBOvU0NHZMmhZNP3 hbW9QMJp0qjDolSc4jWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r3yOe-006aPA-24; Fri, 17 Nov 2023 12:56:32 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r3yOb-006aOK-1F for linux-arm-kernel@lists.infradead.org; Fri, 17 Nov 2023 12:56:30 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 78C7261D50; Fri, 17 Nov 2023 12:56:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31622C433C8; Fri, 17 Nov 2023 12:56:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700225788; bh=yco5pbCsXVo4oB/2D289CCmrjEJWr/ntTfP78uZgSQg=; h=From:To:Cc:Subject:Date:From; b=SyUUwtGZuBn4aCSski5/plxAqG2+LmPMq9vD7y1k4dUlLrsJyGo/NWNMEBQxD5DCL EgtiZ1dJSvVWbLuYP2Pyasc3X2OCJ+gCGVfeBP+YDe7N5UgRsJUl74jOiAUfxACFcV AyL8KDVvUp4DGZ0Nj0BVSkTgu/GHu3z5efDTS/DlaFIzWaGfK1olMftzdaXQq/3Etb Iux6pio2DEnkfR7/Tkvke2cAyFbQC0n9x5HfhjuOwBKCcNBaLhg1azu8t99A2bZ7e7 qK4as0pB0uV6ZJbAg0hmRdjfGu9Lt8Z9aKMAhAelAd5tRJTd1diteDfq/QootGHcPa m6HJPrvkAtZWg== From: Masahiro Yamada To: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH] arm64: vdso32: rename 32-bit debug vdso to vdso32.so.dbg Date: Fri, 17 Nov 2023 21:56:19 +0900 Message-Id: <20231117125620.1058300-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231117_045629_483921_A2790795 X-CRM114-Status: GOOD ( 10.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 'make vdso_install' renames arch/arm64/kernel/vdso32/vdso.so.dbg to vdso32.so during installation, which allows 64-bit and 32-bit vdso files to be installed in the same directory. However, arm64 is the only architecture that requires this renaming. To simplify the vdso_install logic, rename the in-tree vdso file so its base name matches the installed file name. Signed-off-by: Masahiro Yamada --- arch/arm64/Makefile | 2 +- arch/arm64/kernel/vdso32/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 4bd85cc0d32b..4a1ad3248c2d 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -200,7 +200,7 @@ endif endif vdso-install-y += arch/arm64/kernel/vdso/vdso.so.dbg -vdso-install-$(CONFIG_COMPAT_VDSO) += arch/arm64/kernel/vdso32/vdso.so.dbg:vdso32.so +vdso-install-$(CONFIG_COMPAT_VDSO) += arch/arm64/kernel/vdso32/vdso32.so.dbg include $(srctree)/scripts/Makefile.defconf diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 1f911a76c5af..2266fcdff78a 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -118,7 +118,7 @@ endif VDSO_CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os # Build rules -targets := $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso) vdso.so vdso.so.dbg vdso.so.raw +targets := $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso) vdso.so vdso32.so.dbg vdso.so.raw c-obj-vdso := $(addprefix $(obj)/, $(c-obj-vdso)) c-obj-vdso-gettimeofday := $(addprefix $(obj)/, $(c-obj-vdso-gettimeofday)) asm-obj-vdso := $(addprefix $(obj)/, $(asm-obj-vdso)) @@ -127,15 +127,15 @@ obj-vdso := $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso) targets += vdso.lds CPPFLAGS_vdso.lds += -P -C -U$(ARCH) -include/generated/vdso32-offsets.h: $(obj)/vdso.so.dbg FORCE +include/generated/vdso32-offsets.h: $(obj)/vdso32.so.dbg FORCE $(call if_changed,vdsosym) # Strip rule for vdso.so $(obj)/vdso.so: OBJCOPYFLAGS := -S -$(obj)/vdso.so: $(obj)/vdso.so.dbg FORCE +$(obj)/vdso.so: $(obj)/vdso32.so.dbg FORCE $(call if_changed,objcopy) -$(obj)/vdso.so.dbg: $(obj)/vdso.so.raw $(obj)/$(munge) FORCE +$(obj)/vdso32.so.dbg: $(obj)/vdso.so.raw $(obj)/$(munge) FORCE $(call if_changed,vdsomunge) # Link rule for the .so file, .lds has to be first