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: 166154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp504405vqn; Fri, 17 Nov 2023 04:56:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IFK5C9DWFr8PJTQNrZ24hFvaRKg4mozAo+AQaJRhb7/gH5F6ZbyKi2KpEtyWpZSvdW6p/zq X-Received: by 2002:a05:6a20:d90b:b0:186:3083:4a64 with SMTP id jd11-20020a056a20d90b00b0018630834a64mr18602805pzb.23.1700225807698; Fri, 17 Nov 2023 04:56:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700225807; cv=none; d=google.com; s=arc-20160816; b=Uh+Rr7bv1ws1aZfBo/hI2X3FyOpSLk219fM7q+sR6LBZlWyStYpIfluKcUBIlsodxS 6eEcjw49HrRtsbPWa2yEiNLgDWc8kWBp37Fr3vKkY//BzpQhlhNDEGeXSf+IfIHJY9e9 Fnzhug9xRTaqV9HjUaWIGlRgNUYuNmYw5y74uKn56BqMJvKRqLxSvrbVvvK+xbrrHlxH zArEiYo2ectG7WC3YeK+YsApz3NngzUGgwvP35a8/USLlXek/huZDL7xOzTeDVXsd1yC U2TxDzewtehOJEH2n9czByJfuSx4vG6O4eogRMOgJa0pcOc5IykkVEpZ+45v8WdwquWo Hmqg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=L8yeOBtaUuI+iUkc5t076OxD63exlns/XGKKMK4Pr7o=; fh=S2bdk30/YtlhJSLuGvZRly5/gpgTMm+XBRzr8fmduCg=; b=CJ4iSaWgmqau6OZvW4Z3tzqHp+93agoaMSnu3aZQzF61TdmNV/9J3gR3ew2+sCGKST OuYhQOHXwNdZgsjMpyO4ufeVcJ/br9T7pFSuGkSd3GLk6CJ3StvwKDSrHZavGrM5nLlk JBQpzXKYKhU/UWr1gveYT4zyLcEWLbYwQndHQHLcax29JDhsPohYJj0uncpg43VhyiId WZsVudoyLTdpYGizH7qRDWK905jrNIDIhop8TWhhjuE76J51B58uCZ90HJg7aOcz/4Qv 4ypBjjkYnsPmK6gkRiEO68l+P4ccw7uxqTDu1EI0RUHFBSrhPuH7kKoafN1A81soSPTB /7xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SyUUwtGZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id s10-20020a056a00194a00b006c33a1be028si1932930pfk.87.2023.11.17.04.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 04:56:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SyUUwtGZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id A7789809ADFD; Fri, 17 Nov 2023 04:56:45 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345984AbjKQM4d (ORCPT + 30 others); 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 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 17 Nov 2023 04:56:45 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782815976181410187 X-GMAIL-MSGID: 1782815976181410187 '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