From nobody Tue Feb 10 13:18:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598006253; cv=none; d=zohomail.com; s=zohoarc; b=Jeevtj3Fb9EW/NwSIMNt2gemBJ7XS49b3qqB2zuoPNNr6G3Pto1b3M+BmToX8lOYV3o3IH2Jtp6+y4frJcGJcSRHej5Ic0QWyuToTqj7OKgr83X0C8lbXIJHA3a7eVRENgCie3rFTl7e3gJ1mWjGLgfNOBF8EskQAHTRgJwDThs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598006253; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dspYanX3zf7a9yxolnnruaw1M3atSamdkc1hvEVqzGE=; b=iQeCEYmcybbeZ35mrgAdrTNeby7PWiEcdKvluh0p2rnXb/2yoAXXcs+DIMz6k8fMdtByOSekkj9dwUjvf3TsEgdkW484z8m8LTAl8gxqmVxUN8PudbDMGKL2NTfIPLhW6/fu/ZLnTom/4zjtJbIYi7NsIhYH4QQPsxK1Tlz2ujY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598006253333136.6110464679341; Fri, 21 Aug 2020 03:37:33 -0700 (PDT) Received: from localhost ([::1]:40362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k94QO-0002cg-1m for importer@patchew.org; Fri, 21 Aug 2020 06:37:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k94DC-0000pZ-Eq for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:23:54 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50483 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k94DA-0001Sn-HA for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:23:54 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-27-9lFxsQRKOWmfuvZwQfwpvg-1; Fri, 21 Aug 2020 06:23:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D94787309F for ; Fri, 21 Aug 2020 10:23:49 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 089715DA78; Fri, 21 Aug 2020 10:23:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598005431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dspYanX3zf7a9yxolnnruaw1M3atSamdkc1hvEVqzGE=; b=c0caca0hGZwoHWPNwDwOtz3RfyUHCZs7vqg1wHQshe16N5F7bxhoSovMYQB8ylfnXV0P2k iK/6bQZMVhQtEcIvId/sdC3FegAol/pCHnnu5pLe9WOUkBcjvnJ/ukPW/92JQVJWPGCEIZ DtgAhh71qnJa81yYW9DjQWJbkgzvVl4= X-MC-Unique: 9lFxsQRKOWmfuvZwQfwpvg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL v8 019/152] build-sys hack: link with whole .fa archives Date: Fri, 21 Aug 2020 06:21:16 -0400 Message-Id: <20200821102329.29777-20-pbonzini@redhat.com> In-Reply-To: <20200821102329.29777-1-pbonzini@redhat.com> References: <20200821102329.29777-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/21 04:55:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau In order to link the *-obj-y files into tests, we will make static libraries of them in Meson, and then link them as whole archives into the tests. To separate regular static libraries from link-whole libraries, give them a different file extension. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- rules.mak | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/rules.mak b/rules.mak index e79a4005a7..5ab42def82 100644 --- a/rules.mak +++ b/rules.mak @@ -39,6 +39,13 @@ find-symbols =3D $(if $1, $(sort $(shell $(NM) -P -g $1 = | $2))) defined-symbols =3D $(call find-symbols,$1,awk '$$2!=3D"U"{print $$1}') undefined-symbols =3D $(call find-symbols,$1,awk '$$2=3D=3D"U"{print $$1}') =20 +WL :=3D -Wl, +ifdef CONFIG_DARWIN +whole-archive =3D $(WL)-force_load,$1 +else +whole-archive =3D $(WL)--whole-archive $1 $(WL)--no-whole-archive +endif + # All the .mo objects in -m variables are also added into corresponding -y # variable in unnest-vars, but filtered out here, when LINK is called. # @@ -54,11 +61,12 @@ undefined-symbols =3D $(call find-symbols,$1,awk '$$2= =3D=3D"U"{print $$1}') # This is necessary because the exectuable itself may not use the function= , in # which case the function would not be linked in. Then the DSO loading will # fail because of the missing symbol. -process-archive-undefs =3D $(filter-out %.a %.mo,$1) \ +process-archive-undefs =3D $(filter-out %.a %.fa %.mo,$1) \ $(addprefix $(WL_U), \ - $(filter $(call defined-symbols,$(filter %.a, $1)), \ + $(filter $(call defined-symbols,$(filter %.a %.fa, $1= )), \ $(call undefined-symbols,$(filter %.mo,$1)))= ) \ - $(filter %.a,$1) + $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \ + $(filter %.a,$1) =20 extract-libs =3D $(strip $(foreach o,$(filter-out %.mo,$1),$($o-libs))) expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ @@ -122,7 +130,7 @@ LD_REL :=3D $(CC) -nostdlib $(LD_REL_FLAGS) modules: =20 %$(EXESUF): %.o - $(call LINK,$(filter %.o %.a %.mo, $^)) + $(call LINK,$(filter %.o %.a %.mo %.fa, $^)) =20 %.a: $(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"AR","$(TARGET_DIR)$@") @@ -378,7 +386,7 @@ define unnest-vars $(error $o added in $v but $o-objs is not set))) $(shell mkdir -p ./ $(sort $(dir $($v)))) # Include all the .d files - $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$($v)))) + $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$(filter %.= o,$($v))))) $(eval $v :=3D $(filter-out %/,$($v)))) endef =20 --=20 2.26.2