From patchwork Tue Nov 21 23:56:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp991031vqb; Tue, 21 Nov 2023 15:57:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpdvYBx0IwNaDezT7KGOGnFaZLtFjqRKBzIWpcG5/QYgG17frpCYbXbOdziEXRxSf/T/hv X-Received: by 2002:a05:6a20:e30b:b0:187:b5b8:f438 with SMTP id nb11-20020a056a20e30b00b00187b5b8f438mr630644pzb.18.1700611075453; Tue, 21 Nov 2023 15:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700611075; cv=none; d=google.com; s=arc-20160816; b=0gaGkJV0gWPye5BcJrAYi1dQlNYT14TpvTcK/oFDbv8XwjlilPJIs6hWQ7qahcFRO3 DxoMtKQVQfgMpskRIN/aCxM4/1CTPUoC+0Ku+LvRoax44GwRxJnGh3OoplclApw+DXVQ /0UxnGjzthAcSinwt9zNqClosvgq7uXCLytDNxivLJgYQ4lnD/sw9kj9QyedeMY+QF0F yBw5NMAnCYNBLxZxgWu/d1r/q/PZRa1EDJzMVsmSgf3HJYOC92/bn6zKYCzc4rgGi9ei RqROZ3f9sVvrZav1xbbkB1Oq2c2ofFlYJwXjlV4y419S8fKpqwFJNoi2xbUwEphz1RXc DhPA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Bm7p9xKyuAxVXNKaI2SGd9apYGaVMvqyzS1RgsgyAn0=; fh=/47gT1gwZAnqEEt4O4OE4vb0HHfsM+7WswUPP+TBAbs=; b=c7YmekGyxbr6ln16/H+wLjBuZNrPkrNAcSsqva93LJXR79phXdP4iTDv1SxgxcE3x8 F6JdIQ0gEqw0zLVZET/eBY/MI/UunZmPOyT9rY/LV0rXNmDu7hMSm7RvUtmuFgB+5Mw+ mnGLeRgBNacS8aZ/GdDPnXXXYXvWSkDibs8dcDlYOj5oU+/FpVNwloUYLQb2pDmWeHPy iXHUJQCeXfCB6Euj5wKxe39zx3VyzpbC2mHbUJlFtPWiyoMddxLdYglNSu9dPnjzL+je 7+nOY51EUYz5uVsl1QZhf09TDb1NjVLaimMa7FdgLHF82jYLV5C0twlqoSY7KxECCcv9 sU6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P5Oqx2ad; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id lj11-20020a17090b344b00b002839a6e8812si212808pjb.36.2023.11.21.15.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 15:57:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P5Oqx2ad; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id DB9828021236; Tue, 21 Nov 2023 15:57:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234950AbjKUX5V (ORCPT + 99 others); Tue, 21 Nov 2023 18:57:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234933AbjKUX5Q (ORCPT ); Tue, 21 Nov 2023 18:57:16 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD40CE7 for ; Tue, 21 Nov 2023 15:57:12 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA1C7C433C9; Tue, 21 Nov 2023 23:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700611032; bh=PgDod9JVK1SlTO6PB/we26pgwxZ6Hugtd6ddfhtvips=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P5Oqx2adFYIoQ9k4t/Fy/+5td7AJw0Ktf33vV/fGcP8SzAfragsJVRdICPCn1rAiq DY+8pX8mR5/DxUtJobAPYiON00qCGoJvj2BP+5n2et1TWEtFdgFs7egce9cUf+jEoM QuJAxXvWLW5r0KMCYoemcPkKHSz6roL/PrJIA8KHkR+/mWH94Fs+p2YMq8QI05E6ou s/mPI0QIWI4BLxziJ6Est+vJPCMnCuC9lG/Og/BKs8zJ3RLi+amuJSo3nbUqiRZ5bi rhC+VekE2qEghO/hzfZWrvY282W1JlDo00ewShT6Eo4W3aeFl1AH+6vr3odn1i+x/i lKcGM2Gr47bOg== From: Masahiro Yamada To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: Masahiro Yamada , Andy Lutomirski , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] x86: vdso: simplify obj-y addition Date: Wed, 22 Nov 2023 08:56:59 +0900 Message-Id: <20231121235701.239606-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231121235701.239606-1-masahiroy@kernel.org> References: <20231121235701.239606-1-masahiroy@kernel.org> 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 fry.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 (fry.vger.email [0.0.0.0]); Tue, 21 Nov 2023 15:57:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783219959185212018 X-GMAIL-MSGID: 1783219959185212018 Add objects to obj-y in a more straightforward way. CONFIG_X86_32 and CONFIG_IA32_EMULATION are not enabled simultaneously, but even if they are, Kbuild graciously deduplicates obj-y entries. Signed-off-by: Masahiro Yamada --- arch/x86/entry/vdso/Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 2038d9c8e527..cbfb5aab5e9c 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -18,11 +18,6 @@ OBJECT_FILES_NON_STANDARD := y # Prevents link failures: __sanitizer_cov_trace_pc() is not linked in. KCOV_INSTRUMENT := n -VDSO64-$(CONFIG_X86_64) := y -VDSOX32-$(CONFIG_X86_X32_ABI) := y -VDSO32-$(CONFIG_X86_32) := y -VDSO32-$(CONFIG_IA32_EMULATION) := y - # files to link into the vdso vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vobjs32-y := vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o @@ -38,11 +33,11 @@ OBJECT_FILES_NON_STANDARD_vma.o := n OBJECT_FILES_NON_STANDARD_extable.o := n # vDSO images to build -vdso_img-$(VDSO64-y) += 64 -vdso_img-$(VDSOX32-y) += x32 -vdso_img-$(VDSO32-y) += 32 +obj-$(CONFIG_X86_64) += vdso-image-64.o +obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o +obj-$(CONFIG_X86_32) += vdso-image-32.o vdso32-setup.o +obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o -obj-$(VDSO32-y) += vdso32-setup.o OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) @@ -53,9 +48,6 @@ $(obj)/vdso.o: $(obj)/vdso.so targets += vdso.lds $(vobjs-y) targets += vdso32/vdso32.lds $(vobjs32-y) -# Build the vDSO image C files and link them in. -vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o) -obj-y += $(vdso_img_objs) targets += $(foreach x, 64 x32 32, vdso-image-$(x).c vdso$(x).so vdso$(x).so.dbg) CPPFLAGS_vdso.lds += -P -C