From patchwork Wed Aug 23 12:08:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136661 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp453796vqm; Wed, 23 Aug 2023 06:18:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3Cm9GvruE+TLG8yuQZr8i3ur1Nc+9Y132NkyaSq/Ut0DjtsQ4+3TzYpmQNtQ6JzwNW+RS X-Received: by 2002:a17:906:ef8c:b0:99b:bf8d:b7e1 with SMTP id ze12-20020a170906ef8c00b0099bbf8db7e1mr9970806ejb.17.1692796695774; Wed, 23 Aug 2023 06:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692796695; cv=none; d=google.com; s=arc-20160816; b=Dn/gLhB0piE+FJBVLWZGcW1TNu+O2Gl9ev64z9m7TqaMzOYzjUHOkTa9AV0NtFOwkr tCO3Jr/a/3G2LygnIrGBLZYNmlvtGdNv4xuUTukYxUpxwJ3QndNbXprhqwAgYFfQTIYT qMS3VfxFRjri67TKhwsmYBmiOeHX9+gQHVzKHJbMobwblw75Pns+YWd5d0MsbhKyGZql RizLhy24IlJeMT7NLVJGti5hNZBnruuPJTs1rrEUZqd3RCsl8zrvER29GDfLpcL6LtZz o9gdSO+pNSwAm2UHoZQ7GZ9q1/3dy2lczH3T2X38WGO6TaqOksv9JIUoE4a2FOXyNOOp SNWQ== 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=DbaDKBe94UtklW8yIPOWJGMoiKpww2GjI5Bi9aeExAc=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=qcP1WYICWrDas5KbK9h3xylKqsxIulKTjKnVrFlvT38H9EHImsAgyocsWobzjJes2p jHQplImHqHi08bam+lhazmhjGdDugK+DHdyZBD2AUV1mp6AaeLZwPfF2S0vFan7yZKUq Ao0fNJYh9WLGKQ05ge0u0w5YOTPfBfDwiqGTl4sBsezQrhlfLZFkWvdJxiyyMXYDHGBA pmEoG+Jex4clcB6RZbR524Y7nOLbNf+3T3ixmyrKLmc9xpcaWxWc0O/zn++kz7NV74uV zKFxU6gLpWqmE9J4bX7u8zcE7vkcP8iNjZMYJUSvMBh7+hvtnLL3rxak1xl0zp9enNv/ jWBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kJsWMVxr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f9-20020a170906048900b009a1f37fc8basi260059eja.300.2023.08.23.06.17.50; Wed, 23 Aug 2023 06:18:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kJsWMVxr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234630AbjHWMJL (ORCPT + 99 others); Wed, 23 Aug 2023 08:09:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234547AbjHWMJK (ORCPT ); Wed, 23 Aug 2023 08:09:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6A7FE6A; Wed, 23 Aug 2023 05:08:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CD0F96257B; Wed, 23 Aug 2023 12:08:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95DF7C433C7; Wed, 23 Aug 2023 12:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692792502; bh=wIaUNDpaxl1iFWGICefIVbACDsnatb+1rW5UeCfqnZ0=; h=From:To:Cc:Subject:Date:From; b=kJsWMVxrq7Zb5gTMblVZAO5q27JGb9s+/jHSvNC16UjcbmRO6HKzA+47buiAe35Ym ZPHTNawLm6l/WZrkJb9J1oR5z0Ym4YFAFvjSHfwU4LFjyl1tfnI2OJDyX70NKCsbiO dBhUNSOX04IWtdJk858bEM5Ez5gbMX255+f9D9jLoUg3W5NSbcZrz1GTK+o2Xi2wL2 DvUkIcBNs1kDHnGIHlQIL/k0L9vQi7aoDWmxIgjImbk4Te3l3Hv9ht6BdS1P7bs9B5 XwmA8ejfghgW7wY7V3tRcbtIDPnRJVThrMUQLxEEDPN7UZdXdbwneIHgd6uGc+pq2I iglt1KiBved+A== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH] kbuild: get lib-y objects back to static library Date: Wed, 23 Aug 2023 21:08:16 +0900 Message-Id: <20230823120816.824352-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775025988253061628 X-GMAIL-MSGID: 1775025988253061628 Revert the following two commits: - 7273ad2b08f8 ("kbuild: link lib-y objects to vmlinux forcibly when CONFIG_MODULES=y") - 7f2084fa55e6 ("[kbuild] handle exports in lib-y objects reliably") Now, lib-y is back to static library again, and the link order is consistent w/wo CONFIG_MODULES. Since commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost"), .vmlinux.export.c contains references to exported symbols. If a symbol in a lib-y object is exported, that object is always linked even without any explicit user in vmlinux. Signed-off-by: Masahiro Yamada --- Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile index 87a9eef3fb4b..71e9c65d9eae 100644 --- a/Makefile +++ b/Makefile @@ -1113,12 +1113,7 @@ export ARCH_DRIVERS := $(drivers-y) $(drivers-m) # Externally visible symbols (used by link-vmlinux.sh) KBUILD_VMLINUX_OBJS := ./built-in.a -ifdef CONFIG_MODULES -KBUILD_VMLINUX_OBJS += $(patsubst %/, %/lib.a, $(filter %/, $(libs-y))) -KBUILD_VMLINUX_LIBS := $(filter-out %/, $(libs-y)) -else KBUILD_VMLINUX_LIBS := $(patsubst %/,%/lib.a, $(libs-y)) -endif export KBUILD_VMLINUX_LIBS export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds