From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.4296.1635980412177963548 for ; Wed, 03 Nov 2021 16:00:12 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: michael.d.kinney@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10157"; a="229070038" X-IronPort-AV: E=Sophos;i="5.87,207,1631602800"; d="scan'208";a="229070038" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2021 16:00:11 -0700 X-IronPort-AV: E=Sophos;i="5.87,207,1631602800"; d="scan'208";a="729813084" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.88.80]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2021 16:00:10 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen , Leif Lindholm , Ard Biesheuvel Subject: [Patch V2 7/7] BaseTools/Conf: Fix Linux GCC ARM build issues with HII Date: Wed, 3 Nov 2021 15:59:54 -0700 Message-Id: <20211103225954.1680-8-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.32.0.windows.1 In-Reply-To: <20211103225954.1680-1-michael.d.kinney@intel.com> References: <20211103225954.1680-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Update builds_rules.template to add $(SLINK) to the GCC steps for processing HII resources to produce a static library instead of an object file. This improves linker compatibility and specifically fixes a link failure seen on Linux GCC ARM builds of the MdeModulePkg due to mismatched ABI types between the HII resource section and the rest of the libraries. Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Leif Lindholm Cc: Ard Biesheuvel Signed-off-by: Michael D Kinney --- BaseTools/Conf/build_rule.template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 3add1029f276..5f59044da36d 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -668,6 +668,8 @@ "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) - "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} + "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc.obj + "$(SLINK)" cr ${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc.obj + "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) -- 2.32.0.windows.1