From nobody Tue May 7 14:57:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491342103061374.06556702646617; Tue, 4 Apr 2017 14:41:43 -0700 (PDT) Received: from localhost ([::1]:37723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvWCp-0000oj-OF for importer@patchew.org; Tue, 04 Apr 2017 17:41:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvWB3-0008KY-KE for qemu-devel@nongnu.org; Tue, 04 Apr 2017 17:39:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvWAy-0002Yy-Kw for qemu-devel@nongnu.org; Tue, 04 Apr 2017 17:39:49 -0400 Received: from mga01.intel.com ([192.55.52.88]:37968) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvWAy-0002Xy-8c for qemu-devel@nongnu.org; Tue, 04 Apr 2017 17:39:44 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Apr 2017 14:39:41 -0700 Received: from orsmsx101.amr.corp.intel.com ([10.22.225.128]) by orsmga002.jf.intel.com with ESMTP; 04 Apr 2017 14:39:40 -0700 Received: from orsmsx161.amr.corp.intel.com (10.22.240.84) by ORSMSX101.amr.corp.intel.com (10.22.225.128) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 4 Apr 2017 14:39:40 -0700 Received: from orsmsx112.amr.corp.intel.com ([169.254.3.213]) by ORSMSX161.amr.corp.intel.com ([169.254.4.33]) with mapi id 14.03.0319.002; Tue, 4 Apr 2017 14:39:40 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491341984; x=1522877984; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=89pPXBMEpItBJoSzSsJvUOG2YTEgjbGiswUoufIQrHs=; b=MDtaE1f3S2KkvxwlfDgJK6o6MYdJsqbcts1BNLDzIxArzZ7Ih2H9Mazi WeREugkw2XoLGQ07oIK5Zav5S8W1dg==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,275,1486454400"; d="scan'208";a="69295206" From: "Xu, Anthony" To: "'qemu-devel@nongnu.org'" Thread-Topic: [Qemu-devel] [PATCH] Put all trace.o into libqemuutil.a Thread-Index: AdKti+SOxmX8VC4FTw2ocEk39jYO4A== Date: Tue, 4 Apr 2017 21:39:39 +0000 Message-ID: <4712D8F4B26E034E80552F30A67BE0B1A4E5F6@ORSMSX112.amr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiM2YxOWUxOWUtMjc2OC00MjBiLTg1MDctYjJiNjQwOGUwYTIwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6ImhOSldvNFpPUll5WlNONExKSlB1NTZyejdyZkRoUjFqYml4dlIrY25oN1U9In0= dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.22.254.140] Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH] Put all trace.o into libqemuutil.a X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 'Stefan Hajnoczi' , 'Paolo Bonzini' Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Put all trace.o into libqemuutil.a Currently all trace.o are linked into qemu-system, qemu-img,=20 qemu-nbd, qemu-io etc., even the corresponding components=20 are not included. Put all trace.o into libqemuutil.a that the linker would only pull in .o=20 files containing symbols that are actually referenced by the=20 program. Signed-off -by: Anthony Xu diff --git a/Makefile b/Makefile index 6c359b2..31d41a7 100644 Reviewed-by: Daniel P. Berrange --- a/Makefile +++ b/Makefile @@ -346,7 +346,7 @@ dtc/%: mkdir -p $@ $(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj= -y) \ - $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) $(trace-obj-y) + $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) ROMSUBDIR_RULES=3D$(patsubst %,romsubdir-%, $(ROMS)) # Only keep -O and -g cflags @@ -366,11 +366,11 @@ Makefile: $(version-obj-y) # Build libraries libqemustub.a: $(stub-obj-y) -libqemuutil.a: $(util-obj-y) +libqemuutil.a: $(util-obj-y) $(trace-obj-y) ###################################################################### -COMMON_LDADDS =3D $(trace-obj-y) libqemuutil.a libqemustub.a +COMMON_LDADDS =3D libqemuutil.a libqemustub.a qemu-img.o: qemu-img-cmds.h diff --git a/Makefile.target b/Makefile.target index d5ff0c7..69239e0 100644 --- a/Makefile.target +++ b/Makefile.target @@ -185,8 +185,7 @@ dummy :=3D $(call unnest-vars,.., \ qom-obj-y \ io-obj-y \ common-obj-y \ - common-obj-m \ - trace-obj-y) + common-obj-m) target-obj-y :=3D $(target-obj-y-save) all-obj-y +=3D $(common-obj-y) all-obj-y +=3D $(target-obj-y) @@ -198,7 +197,7 @@ all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) $(QEMU_PROG_BUILD): config-devices.mak -COMMON_LDADDS =3D $(trace-obj-y) ../libqemuutil.a ../libqemustub.a +COMMON_LDADDS =3D ../libqemuutil.a ../libqemustub.a # build either PROG or PROGW $(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) diff --git a/tests/Makefile.include b/tests/Makefile.include index f3de81f..579ec07 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -519,7 +519,7 @@ QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests # Deps that are common to various different sets of tests below -test-util-obj-y =3D $(trace-obj-y) libqemuutil.a libqemustub.a +test-util-obj-y =3D libqemuutil.a libqemustub.a test-qom-obj-y =3D $(qom-obj-y) $(test-util-obj-y) test-qapi-obj-y =3D tests/test-qapi-visit.o tests/test-qapi-types.o \ tests/test-qapi-event.o tests/test-qmp-introspect.o \