From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: zhijux.fan@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Tue, 16 Apr 2019 19:02:07 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Apr 2019 19:02:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,360,1549958400"; d="dat'59?scan'59,208,59";a="162258994" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga002.fm.intel.com with ESMTP; 16 Apr 2019 19:02:07 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 16 Apr 2019 19:02:07 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 16 Apr 2019 19:02:06 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.164]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.149]) with mapi id 14.03.0415.000; Wed, 17 Apr 2019 10:02:04 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH] BaseTools:Makefiles cause data errors on some platforms Thread-Topic: [PATCH] BaseTools:Makefiles cause data errors on some platforms Thread-Index: AdT0wYxaVilvLYBySuuuj4yOysYlVg== Date: Wed, 17 Apr 2019 02:02:04 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 39195 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4BD30SHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4BD30SHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable As the Dict is unordered, an error occurs when using the Dict while creating a new item.So for now, use OrdereDict instead of Dict. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/AutoGen/GenMake.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index 7562dc68b3..426e6ca51a 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -429,7 +429,7 @@ cleanlib: self.CommonFileDependency =3D [] self.FileListMacros =3D {} self.ListFileMacros =3D {} - self.ObjTargetDict =3D {} + self.ObjTargetDict =3D OrderedDict() self.FileCache =3D {} self.LibraryBuildCommandList =3D [] self.LibraryFileList =3D [] @@ -954,11 +954,9 @@ cleanlib: self.ListFileMacros[T.IncListFileMacro] =3D [] if self._AutoGenObject.BuildRuleFamily =3D=3D TAB_COMPILER= _MSFT and Type =3D=3D TAB_C_CODE_FILE: NewFile =3D self.PlaceMacro(str(T), self.Macros) - if self.ObjTargetDict.get(T.Target.SubDir): - self.ObjTargetDict[T.Target.SubDir].add(NewFile) - else: + if not self.ObjTargetDict.get(T.Target.SubDir): self.ObjTargetDict[T.Target.SubDir] =3D set() - self.ObjTargetDict[T.Target.SubDir].add(NewFile) + self.ObjTargetDict[T.Target.SubDir].add(NewFile) =20 Deps =3D [] CCodeDeps =3D [] --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4BD30SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+ImAVAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAAEM0MzA1NTYz MTFGMEJFNDg5QzM0REI0ODhDNTgxQjZGACQHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBAARAAIA AgAEAAMACgEBIIADAA4AAADjBwQAEQACAAIABAADAAoBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEAAAABbUEFUQ0hdIEJhc2VUb29sczpNYWtlZmlsZXMgY2F1c2UgZGF0 YSBlcnJvcnMgb24gc29tZSBwbGF0Zm9ybXMAEBcBC4ABACEAAABDNDMwNTU2MzExRjBCRTQ4OUMz NERCNDg4QzU4MUI2RgAkBwEDkAYACA4AADMAAAACAX8AAQAAAEgAAAA8RkFEMEQ3RTBBRTBGQTU0 RDk4N0Y2RTcyNDM1Q0FGRDUwQUY0QkQzMEBTSFNNU1gxMDEuY2NyLmNvcnAuaW50ZWwuY29tPgAL AB8OAQAAAAIBCRABAAAAVQQAAFEEAAAKCQAATFpGdUjTrGNhAApmYmlkBAAAY2PAcGcxMjUyAP4D Q/B0ZXh0AfcCpAPjAgAEY2gKwHNldDAg7wdtAoMAUBFNMgqABrQCgJZ9CoAIyDsJYjE5DsC/CcMW cgoyFnECgBViKgmwcwnwBJBhdAWyDlADYHOibwGAIEV4EcFuGDBdBlJ2BJAXtgIQcgDAdH0IUG4a MRAgBcAFoBtkZJogA1IgECIXslx2CJDkd2sLgGQ1HVME8AdADRdwMApxF/Jia21rBnMBkAAgIEJN X0LgRUdJTn0K/AHxC/GkIEEEIHRoGeBEDlDjBUAEACB1bgWwBIEJgDwsIAORBJADYAXAb2O2Ywhw BCB3IeADoHUAkNMZwCHHXGwLgGUKgCRANwMQGeAFAGUYgCSyYSALGFAH4GkQIG0uU293HHAFsSKg dyMgJJAZ4E/vIsMiFACAECBhCzAlhBkwjSIDLiV1JXVDYzofsLBvYiBGCfAk0DwG4KBiLmMuZiwB QAuArRAgbCyAA3A+KwlMB3BpJLJHYSeQPCWALnIuTmcu0Cz/FMBpZxhQZEItGTBmLWJ5K5BaISXw anUuRgORPHqdMdJ4LKAAcC+/Ci00MEsldR+wYRIAVG8G8HMGLyeACHBjZS9QeaMh0AIgL0F1GJBH CfACLzahTWFrZS5wgHkgfCA4ICs30Hs0MTRIMRxwJgMZoyMRMwspIhuBaQIgcygrKTkjIDUgAQAe cDpELSnXKpwN4AEgIDQwZycwIzDuLzTvNf83B2I9bz5/NvcHJXUdsRAwIDc1NjIAZGM2OGIzLi4g NDI2ZTYeUDUx4ybQHpE2NDQzyD1PQS89Qj8KN9FAH0c/SE8KQMZAPOBEcDksNzfATRSdTNFjHnAA cCWAYjo0ZqNPFhIAbGYuCFBtBGDEbkYmAURlcAnwAQCEbmM3cD0gW11Or39PslBSLlAfYDcQGPJR MVz/AAAgQFGfT8FTElBSU180AmFPK09ialQKwBgwdL8iE1PLSYBXX1hpKIRkIhLmKDu2Uf9lQwDQ IeFTz4VU2mIYcHJ5QnUDEPZkT/IAcGRTElE/X45S1oNhikzSOTU0LDE40PorZRI5Td9iGmdqVS8Z ELBbVC5JUQBVe11hj/drqgaQT5RfS0VYEQWQKnC5YINSdR5wMiAucGxRIQFq8FRBQl9DT01AUElM RVJfBeBG5lQjMRxgVHlQsG8Xb4HwREVfRm/RZq9y6gfBd1BSauFPo1ALYEqgVfMo8R9gcihUOrFP o1X0O7a/Vzdr/1p+L3ASEHXALlhEySdwdWIiEHIpciZ3T09Z31hXaaF6W10uKYBk/ihz9XbPgPot MBIAciZZx/933SKgBUB9T3nfeuuDD3zP/33ffud0Y1xIgL+Ij4mffu//f/qCz41/jo+Pn1xnhw9P Fe9QkVOiax9PF0MIUAEAl35DRgEldTIuMTSbgC73A/AdwCgAc5uAKpwVQp2QAAAAHwBCAAEAAAAY AAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwBlAAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEA bgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAGQAAQAAAAoAAABTAE0AVABQAAAAAAACAUEAAQAA AGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0A VABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwACXQEAAAAq AAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAOVfAQAAADIA AABzAGkAcAA6AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAa DAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwAfDAEAAAAqAAAAegBoAGkAagB1AHgA LgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAB4MAQAAAAoAAABTAE0AVABQAAAAAAAC ARkMAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgA AABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwAB XQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAPg/ AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfACNAAQAAACoAAAB6AGgAaQBqAHUAeAAu AGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AIkABAAAACgAAAFMATQBUAFAAAAAAAAIB +T8BAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAA AFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAld AQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAAsAQDoB AAAAHwAaAAEAAAASAAAASQBQAE0ALgBOAG8AdABlAAAAAAADAPE/CQQAAAsAQDoBAAAAAwD9P+QE AAACAQswAQAAABAAAADEMFVjEfC+SJw020iMWBtvAwAXAAEAAABAADkAAHZ5jcH01AFAAAgw+rKB jcH01AEfAACAhgMCAAAAAADAAAAAAAAARgEAAAAeAAAAYQBjAGMAZQBwAHQAbABhAG4AZwB1AGEA ZwBlAAAAAAABAAAADAAAAGUAbgAtAFUAUwAAAB8ANwABAAAAgAAAAFsAUABBAFQAQwBIAF0AIABC AGEAcwBlAFQAbwBvAGwAcwA6AE0AYQBrAGUAZgBpAGwAZQBzACAAYwBhAHUAcwBlACAAZABhAHQA YQAgAGUAcgByAG8AcgBzACAAbwBuACAAcwBvAG0AZQAgAHAAbABhAHQAZgBvAHIAbQBzAAAAHwA9 AAEAAAACAAAAAAAAAAMANgAAAAAAAgFxAAEAAAAWAAAAAdT0wYxaVilvLYBySuuuj4yOysYlVgAA HwBwAAEAAACAAAAAWwBQAEEAVABDAEgAXQAgAEIAYQBzAGUAVABvAG8AbABzADoATQBhAGsAZQBm AGkAbABlAHMAIABjAGEAdQBzAGUAIABkAGEAdABhACAAZQByAHIAbwByAHMAIABvAG4AIABzAG8A bQBlACAAcABsAGEAdABmAG8AcgBtAHMAAAAfADUQAQAAAJAAAAA8AEYAQQBEADAARAA3AEUAMABB AEUAMABGAEEANQA0AEQAOQA4ADcARgA2AEUANwAyADQAMwA1AEMAQQBGAEQANQAwAEEARgA0AEIA RAAzADAAQABTAEgAUwBNAFMAWAAxADAAMQAuAGMAYwByAC4AYwBvAHIAcAAuAGkAbgB0AGUAbAAu AGMAbwBtAD4AAAADAN4/n04AAEAABzAQzHWNwfTUAQIBCwABAAAAEAAAAMQwVWMR8L5InDTbSIxY G28DACYAAAAAAAIBRwABAAAAMwAAAGM9VVM7YT1NQ0k7cD1JbnRlbDtsPVNIU01TWDEwMS0xOTA0 MTcwMjAyMDRaLTE1MzUyAAACARAwAQAAAEYAAAAAAAAAJne9OTvsOEmkphU9y6V7QgcA+tDX4K4P pU2Yf25yQ1yv1QAAAEQRXgAAppNoNoh2bEunStPrR5pMZAAACVSPSwAAAAAfAPo/AQAAABgAAABG AGEAbgAsACAAWgBoAGkAagB1AFgAAAADAAlZAQAAAEAAAIAIIAYAAAAAAMAAAAAAAABGAAAAAL+F AACACV2MwfTUAQsAAIAIIAYAAAAAAMAAAAAAAABGAAAAAIKFAAAAAAAAHwAAgIYDAgAAAAAAwAAA AAAAAEYBAAAAGAAAAGQAbABwAC0AcAByAG8AZAB1AGMAdAAAAAEAAAAaAAAAZABsAHAAZQAtAHcA aQBuAGQAbwB3AHMAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHYAZQBy AHMAaQBvAG4AAAABAAAAFgAAADEAMQAuADAALgA2ADAAMAAuADcAAAAAAB8AAICGAwIAAAAAAMAA AAAAAABGAQAAABoAAABkAGwAcAAtAHIAZQBhAGMAdABpAG8AbgAAAAAAAQAAABQAAABuAG8ALQBh AGMAdABpAG8AbgAAAAMADTT9PwAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAIAAAAHgALQBtAHMA LQBoAGEAcwAtAGEAdAB0AGEAYwBoAAAAAQAAAAIAAAAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYB AAAAIgAAAHgALQBvAHIAaQBnAGkAbgBhAHQAaQBuAGcALQBpAHAAAAAAAAEAAAAgAAAAWwAxADAA LgAyADMAOQAuADEAMgA3AC4ANAAwAF0AAAD8CA== --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4BD30SHSMSX101ccrcor_--