From nobody Tue Dec 30 08:52:05 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F018BC47071 for ; Fri, 17 Nov 2023 12:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346006AbjKQM4d (ORCPT ); Fri, 17 Nov 2023 07:56:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229543AbjKQM4b (ORCPT ); Fri, 17 Nov 2023 07:56:31 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AFF7D57 for ; Fri, 17 Nov 2023 04:56:28 -0800 (PST) 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" '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 =20 vdso-install-y +=3D arch/arm64/kernel/vdso/vdso.so.dbg -vdso-install-$(CONFIG_COMPAT_VDSO) +=3D arch/arm64/kernel/vdso32/vdso.so.d= bg:vdso32.so +vdso-install-$(CONFIG_COMPAT_VDSO) +=3D arch/arm64/kernel/vdso32/vdso32.so= .dbg =20 include $(srctree)/scripts/Makefile.defconf =20 diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/M= akefile 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 =3D $(CC_FLAGS_FTRACE) -Os =20 # Build rules -targets :=3D $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso) vdso= .so vdso.so.dbg vdso.so.raw +targets :=3D $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso) vdso= .so vdso32.so.dbg vdso.so.raw c-obj-vdso :=3D $(addprefix $(obj)/, $(c-obj-vdso)) c-obj-vdso-gettimeofday :=3D $(addprefix $(obj)/, $(c-obj-vdso-gettimeofda= y)) asm-obj-vdso :=3D $(addprefix $(obj)/, $(asm-obj-vdso)) @@ -127,15 +127,15 @@ obj-vdso :=3D $(c-obj-vdso) $(c-obj-vdso-gettimeofday= ) $(asm-obj-vdso) targets +=3D vdso.lds CPPFLAGS_vdso.lds +=3D -P -C -U$(ARCH) =20 -include/generated/vdso32-offsets.h: $(obj)/vdso.so.dbg FORCE +include/generated/vdso32-offsets.h: $(obj)/vdso32.so.dbg FORCE $(call if_changed,vdsosym) =20 # Strip rule for vdso.so $(obj)/vdso.so: OBJCOPYFLAGS :=3D -S -$(obj)/vdso.so: $(obj)/vdso.so.dbg FORCE +$(obj)/vdso.so: $(obj)/vdso32.so.dbg FORCE $(call if_changed,objcopy) =20 -$(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) =20 # Link rule for the .so file, .lds has to be first --=20 2.40.1