From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 11A8C211ADA2F for ; Wed, 2 Jan 2019 18:48:49 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9AE507BDD8; Thu, 3 Jan 2019 02:48:48 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-123-131.rdu2.redhat.com [10.10.123.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55C7E5D738; Thu, 3 Jan 2019 02:48:47 +0000 (UTC) From: Laszlo Ersek To: edk2-devel-01 Cc: Bob Feng , Liming Gao , Yonghong Zhu Date: Thu, 3 Jan 2019 03:48:02 +0100 Message-Id: <20190103024816.9236-13-lersek@redhat.com> In-Reply-To: <20190103024816.9236-1-lersek@redhat.com> References: <20190103024816.9236-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 03 Jan 2019 02:48:48 +0000 (UTC) Subject: [PATCH 12/26] BaseTools/tools_def.template: propagate loss of GCC46 references X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2019 02:48:49 -0000 Content-Transfer-Encoding: 8bit The last patch decremented references on a number of DEFs. They can be classified into three groups: (a) those that remain used by multiple toolchains (refcount >= 2): - GCC_ASLCC_FLAGS - GCC_ASLPP_FLAGS - GCC_HOST_PREFIX - GCC_IA32_RC_FLAGS - GCC_PP_FLAGS - GCC_VFRPP_FLAGS - GCC_X64_RC_FLAGS - IASL_FLAGS - IASL_OUTFLAGS - UNIX_IASL_BIN (b) those that are only used by GCC48 (refcount == 1): - GCC46_ASM_FLAGS - GCC46_IA32_CC_FLAGS - GCC46_IA32_DLINK2_FLAGS - GCC46_IA32_X64_ASLDLINK_FLAGS - GCC46_IA32_X64_DLINK_FLAGS - GCC46_X64_CC_FLAGS - GCC46_X64_DLINK2_FLAGS - GCC46_X64_DLINK_FLAGS (c) those that are no longer used (refcount == 0): - GCC46_IA32_PREFIX - GCC46_X64_PREFIX For the members of class (b), expand their definitions at the referring sites, and remove their definitions. For the members of class (c), remove their definitions. Cc: Bob Feng Cc: Liming Gao Cc: Yonghong Zhu Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1377 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek --- BaseTools/Conf/tools_def.template | 28 ++++++-------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index d345050aa844..dc43fed2b3ad 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -193,9 +193,6 @@ DEFINE GCC44_X64_PREFIX = ENV(GCC44_BIN) DEFINE GCC45_IA32_PREFIX = ENV(GCC45_BIN) DEFINE GCC45_X64_PREFIX = ENV(GCC45_BIN) -DEFINE GCC46_IA32_PREFIX = ENV(GCC46_BIN) -DEFINE GCC46_X64_PREFIX = ENV(GCC46_BIN) - DEFINE GCC48_IA32_PREFIX = ENV(GCC48_BIN) DEFINE GCC48_X64_PREFIX = ENV(GCC48_BIN) @@ -4180,23 +4177,14 @@ DEFINE GCC45_X64_DLINK_FLAGS = DEF(GCC44_X64_DLINK_FLAGS) DEFINE GCC45_X64_DLINK2_FLAGS = DEF(GCC44_X64_DLINK2_FLAGS) DEFINE GCC45_ASM_FLAGS = DEF(GCC44_ASM_FLAGS) -DEFINE GCC46_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Wno-address -DEFINE GCC46_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Wno-address -DEFINE GCC46_IA32_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -DEFINE GCC46_IA32_X64_DLINK_FLAGS = DEF(GCC45_IA32_X64_DLINK_FLAGS) -DEFINE GCC46_IA32_DLINK2_FLAGS = DEF(GCC45_IA32_DLINK2_FLAGS) -DEFINE GCC46_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS) -DEFINE GCC46_X64_DLINK2_FLAGS = DEF(GCC45_X64_DLINK2_FLAGS) -DEFINE GCC46_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) - -DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -DEFINE GCC48_X64_CC_FLAGS = DEF(GCC46_X64_CC_FLAGS) -DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC46_IA32_X64_DLINK_FLAGS) -DEFINE GCC48_IA32_DLINK2_FLAGS = DEF(GCC46_IA32_DLINK2_FLAGS) -DEFINE GCC48_X64_DLINK_FLAGS = DEF(GCC46_X64_DLINK_FLAGS) -DEFINE GCC48_X64_DLINK2_FLAGS = DEF(GCC46_X64_DLINK2_FLAGS) -DEFINE GCC48_ASM_FLAGS = DEF(GCC46_ASM_FLAGS) +DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Wno-address +DEFINE GCC48_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Wno-address +DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) +DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC45_IA32_X64_DLINK_FLAGS) +DEFINE GCC48_IA32_DLINK2_FLAGS = DEF(GCC45_IA32_DLINK2_FLAGS) +DEFINE GCC48_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS) +DEFINE GCC48_X64_DLINK2_FLAGS = DEF(GCC45_X64_DLINK2_FLAGS) +DEFINE GCC48_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian DEFINE GCC48_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fstack-protector -mword-relocations -- 2.19.1.3.g30247aa5d201