From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.26513.1652055625095450732 for ; Sun, 08 May 2022 17:20:25 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=PQDsekpA; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: bob.c.feng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652055625; x=1683591625; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=9cxtEznhojz8HAyrsN2svXPLcUJ88aC+OJ+1rhP+MfA=; b=PQDsekpAJPR0cicH4bqovZ0TzKUKNmoim7Xxrkb+q5XAv/qGN44r9/k1 AvpdluIfmmHm580i5RqYNnsS3Je1voXi9q9Mspcm3qRzqdq0Duqk5Ife4 f9fX+f+ADlHhWfF1FyKPOB4TdIlU0rwyUxJLqbgDkZVMZNJAGJqRQMzlt dkunt7K5qKXbuswefE7t8yCVB6Zv/uScVl24VMdd3svSVINBZkpR3DA/M ffXloEl7i4Q2xTafvGu53xknKDCuU7h7pK2Y4RkPAV1/T64W7vywD3P/J t60mp+/z6GkzNg2iIMLcZaypxBpeYhUR7xLJng+S2SLZJXuZvRVkRZr9C g==; X-IronPort-AV: E=McAfee;i="6400,9594,10341"; a="268551639" X-IronPort-AV: E=Sophos;i="5.91,210,1647327600"; d="scan'208";a="268551639" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2022 17:20:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,210,1647327600"; d="scan'208";a="655809296" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by FMSMGA003.fm.intel.com with ESMTP; 08 May 2022 17:20:23 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Sun, 8 May 2022 17:20:22 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Sun, 8 May 2022 17:20:22 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Sun, 8 May 2022 17:20:22 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.102) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Sun, 8 May 2022 17:20:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=loqfJshq5mvyTguazzDq5O1xpUCMyxrTZQLkNYPXJwt5H9SG5njLGm5EPElZ09no9rBhQBouAGSiE+Wep6O8QWhy9kTTupucADw1Uytl8x/7QmIhTIWfWSR6DPxD4l2kGpVirKF8DIGdZpSF08eTmClqwkiXxSLEsY+n08kpf6NxZAjTSspImdp4DDLbdwVexs0ntSp3FCS8yV7TiURj4IRkAD0ZUXFpQu185jjcbN1UktPrgKsBQGECb+koFockdG75iq10AiPN8sZ6GEWe4LXK7gMlX2fCOICOvD6r29F+Ga9gokYo+4ngWEUH6fA+jscyPnhU7Eug45K2XvJmJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=67RlRTK7WjR3sQlCjpi+xw5z6ZOZVQbVOQaEWdN/E+Q=; b=PoyV+v7exfeEYGnUWy88MveShpBb41B7D3auAv7eysCqIXatcFguGdv8R213KTcOlZ3lhYQ+p6qZmSeM711xXFs4USSgg5SN3+GeFZTPbgsOJeF6HUJirN57SexpvXBqP5A4hjlRBkymnoD4fyeGmJ5JhiMS2yPy3yz6cGlNSd8KFqoxJj70DHaF45yH/Ad8Ur+e0dnewnib1y0fMcjrOZO/u27QPad7yNBjkxEExYKwNvdRfvuoyzu5EP6Kscsv4TyAbUw5+bp3eT5Qzo1+R3Ad49NbLvKG+HQ5QDfUc9OuqDYVZVoJD5AV3oigBxXO1+7k7fA1yFTkd82lrVjcYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from PH7PR11MB5863.namprd11.prod.outlook.com (2603:10b6:510:135::11) by CY4PR1101MB2328.namprd11.prod.outlook.com (2603:10b6:903:b6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.22; Mon, 9 May 2022 00:20:19 +0000 Received: from PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::bdfa:2a87:8b69:fb8c]) by PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::bdfa:2a87:8b69:fb8c%9]) with mapi id 15.20.5227.020; Mon, 9 May 2022 00:20:19 +0000 From: "Bob Feng" To: Rebecca Cran , "devel@edk2.groups.io" , Leif Lindholm , "Ard Biesheuvel" , Sami Mujawar , Gerd Hoffmann , "Gao, Liming" , "Chen, Christine" , "Yao, Jiewen" , "Wang, Jian J" , "Lu, Xiaoyu1" , "Jiang, Guomin" , "Chang, Abner" , "Schaefer, Daniel" , "Ni, Ray" , "Kinney, Michael D" , "Liu, Zhiguang" , Maciej Rabeda , "Wu, Jiaxin" , "Fu, Siyuan" , "Justen, Jordan L" , Anthony Perard , Julien Grall Subject: Re: [PATCH 10/10] BaseTools: Remove RVCT support Thread-Topic: [PATCH 10/10] BaseTools: Remove RVCT support Thread-Index: AQHYXx59AanXMvczKkObxf5freiIBa0VtsaQ Date: Mon, 9 May 2022 00:20:19 +0000 Message-ID: References: <20220503184820.19312-1-quic_rcran@quicinc.com> <20220503184820.19312-11-quic_rcran@quicinc.com> In-Reply-To: <20220503184820.19312-11-quic_rcran@quicinc.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.401.20 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 01299f46-a43d-4f90-6de2-08da3151b321 x-ms-traffictypediagnostic: CY4PR1101MB2328:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: k9YR9x8MxWKxV601YFA0yqo4ls3dHdcwD6KZFurWpehsweVPnUpIrTViMxNhgwyECUSAa1pCBIsB4PJEu5kyxatpsCxPS+z/3ivKyuESDj/j8mWdPhN6GPQ5hK4F1YasN0AXwyoXppoi520zsT54Ye/9eyVXDjbm36WWyKTZ3w/yJKKimgPxGD5uuob23B/E3olNRYKGVjUN3jgtS9kysdT4by/sElKER6Nwj2FGfiJo02/pK66Mq4+y97qezX6QupCV/cfY/G0uU4WAFigORP9YIbrVT3NaCf2MzkF6fQ6UIVJj/KFBf8s7WljltNsWRnaBdesu4w+8yzJP2eD8jcN5kkjzEdbHxkiXiMl06mhc0R6uui2EwR/HEEn4VXhW7X7niO4DwKt9CdeufIqu0E3NLYAKiMvhvH+4WWqdTipoSBqDSDzThsBvNSqLvrX/oWOdTHfrO5/RkrJsdnH9DPkimdoqDqzGg25Ia6vgbS6o8sOpixsDg4MjFg+8+UlWX4YfPX8C8H1YBBcAlqRj9NqoOKA3I/+sdKVToSdkxJ42gcRtQeZfGXpqmr49poOUiJ9K0oFJbjfOrzc0DG3lb9ivw+dqgXyjn6Vxi7waqDnLurq6txp8a3jBxnOyndyNuiChqWvaOiDDa45r+kPgUSORX4aCP4oaw0NZY+6ekjBKBbDQe1EAHqGiFum4J3ZIow7tHjVX8GafKmt9F74clT4PSqFnKJsUfO0UJo5xyHcS4HA3BRKTuQ+QUveRYjvccQ2kFIZcXAE3i5m4wgRPojDu4zxXRAxf4Mg72x7Wb8+Z03k5nLb2jN+vdJhBC4utXya7jdhu+nGJJA2eRjWfXQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB5863.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(8936002)(19627235002)(8676002)(66556008)(66946007)(52536014)(110136005)(64756008)(66446008)(76116006)(66476007)(316002)(86362001)(921005)(45080400002)(53546011)(82960400001)(9686003)(122000001)(7696005)(26005)(6506007)(508600001)(71200400001)(2906002)(33656002)(38070700005)(966005)(55016003)(186003)(83380400001)(30864003)(7416002)(5660300002)(38100700002)(579004)(460985005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?PVg7B69Od6ThGdPA8X55cQoT8kGaUiizeTrM0r/gmR3nKmcT+Wo+xDKnfSH3?= =?us-ascii?Q?aI2KHh2Of7vjneukDsBZlU8MaIRKI5DNQQ2ypXDZQw94sQEwypu7xsE/vzeF?= =?us-ascii?Q?pEqQ60EP1hd0ccBQKqjNltfb5bKbt1i7uA3ewyxR6LRfiUB2KQcW/64WMpsM?= =?us-ascii?Q?2pYlkkLfE/wjLhG7cw7WTcTA8zoWB2r0PQaRt69Wh8EUJCwuAXbQRyhL6Gsl?= =?us-ascii?Q?BK6LGKcwnl9WARsrNBZrWW/uOd6W0C18HYVknmBQz4kUYpU22kluAOl1sJ3i?= =?us-ascii?Q?VX9ogD7FnVEWbRdnk0bhA/RolxtilxhjTlQzEu9mC0uuBzSESzn7uAt5mki4?= =?us-ascii?Q?ZFGAA/hwRKQf09LjyRT6SDp9u7Qzy24KOIC64ihCUcyMkPNaF7y0Q7JROZYN?= =?us-ascii?Q?oTCNILIIUsGCk+stwyJtrWXlZYB+Zb+h1CtbztA/yAFADQZq20ELYyeZL3Qm?= =?us-ascii?Q?YiIdYDkOgANHEocTXME5vXfQzZTe0MZ1WRLVvhdQTE1knOXt5vvS1j91JYdY?= =?us-ascii?Q?r+iBXybJb83usFRjgVqqYuqL2H0Wdh5/R20KZSi73F/QT58NYIGrHlQRJdxp?= =?us-ascii?Q?B3t8qXloYzKT+DW2Xt4lsWTWbj8nSUCdqVjoFG4AzZ0zAQQEvjsTu5Y4W30x?= =?us-ascii?Q?JKqJl8tK06JzHWFmBAXe8O2vo6a+yMGPBxa9hdRadw39QIGf9f78e99qHjve?= =?us-ascii?Q?FTvZ3hsHppk+IbVq2n3W4NM/doiJL3qqSasZpkBannYi+GdOvCujmJ1FkttI?= =?us-ascii?Q?ZBKDGSb4vBefCldxlS2BvYntEKGPkNdXHOuDY7zScWktmWb3H1DafSqG0reE?= =?us-ascii?Q?JQk0tt8d7rx15cZSlO/pSH8Irxlcyw+vafGN8z7Moj3xgUnqqHaxBUN8lcqR?= =?us-ascii?Q?x7+alHZMNZ11wrfkMjkUjQYO6paeq0tZBVEmBw91EIYzzigSnnha7s6+gVsz?= =?us-ascii?Q?6vKxXDunn5CQoiOlync0b/l7EN9AVUPo2vz0nbsI2LQJmFijidtcdjFNAfee?= =?us-ascii?Q?Yd3/p3AU9FCR3wEcKXqji6HG+4qbWpaPtq97VhMyQutMSJDCAZSpZOs/coQz?= =?us-ascii?Q?BIU3tVTxYjI6XUAu3MZAPnbqkGFl6irs59P2+y0NAgVjv90eWZ6VlI9CGpPO?= =?us-ascii?Q?veIUYCb0dIAWSd/epDT26VjbiSh47vECCEiDMv7jhC3KCx9KdcsT/5esvdtO?= =?us-ascii?Q?uMjS7RR4Mh+tM97j6d/T24x71DUNSiuB0VyRUEGPd1PO7/S6Hxf9po+N5uvy?= =?us-ascii?Q?ouGjbFkt9wyPGVY9mzD1oo6YD4c/Cp+3HOR0i9qJUsazQ1JfZ3RkFCOArxOQ?= =?us-ascii?Q?idyyBHxhkN6IgDExGR/8SuCcyGGbk+/yFu4YjB/UrfTVltZql2IUHetjkR5h?= =?us-ascii?Q?F/T0HhzIRRB9P5weRwpWVedecZ+Ou9qetRKsJXrrc84NDuTILRRp58SRIos9?= =?us-ascii?Q?rLe8RGhWq4SmTNmnqyNeM/jZK1aTrQYwzpwlDfX+vACKrlJGlZgjQxSJo7+B?= =?us-ascii?Q?1tir9xf/TXG4yTlzkzzzxYGMDnODQ4OZNx1RuxMxgxvj4oICd1sRumMF4zD0?= =?us-ascii?Q?ASetrY2iHVwAk5TqvB8J9A06n6skp68A1qwz4kLtJ/0IM1IErjYL/cfKonzA?= =?us-ascii?Q?Q07fez/wRFxCr0r6bGQsSL5TP8W7MeOeRbLPyJuG7DdraVYmkIWUXFIxHuT9?= =?us-ascii?Q?NQmmjzypqDNa2CJxLz9uU1DRA7aJ1DjIRJHHjS7KyDs1ApkxhO2P7eCXLB5G?= =?us-ascii?Q?WBfNs2rfPw=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5863.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01299f46-a43d-4f90-6de2-08da3151b321 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2022 00:20:19.3459 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: iVZq1CizQDTo4K8clZxP3jEe61+8Lypb2xi5LfVS+KSSty8K0yWkGc6pjyETG6XskDphn5IQow5obYvVxcdfsA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2328 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Rebecca Cran =20 Sent: Wednesday, May 4, 2022 2:48 AM To: devel@edk2.groups.io; Leif Lindholm ; Ard Bi= esheuvel ; Sami Mujawar ; = Gerd Hoffmann ; Feng, Bob C ; Gao,= Liming ; Chen, Christine ;= Yao, Jiewen ; Wang, Jian J ; = Lu, Xiaoyu1 ; Jiang, Guomin ;= Chang, Abner ; Schaefer, Daniel ; Ni, Ray ; Kinney, Michael D ; Liu, Zhiguang ; Maciej Rabeda ; Wu, Jiaxin ; Fu, Siyuan ; Justen, Jordan L ; Anthony Perard ; Julien Grall Cc: Rebecca Cran Subject: [PATCH 10/10] BaseTools: Remove RVCT support RVCT is obsolete and no longer used. Remove support for it. Signed-off-by: Rebecca Cran --- BaseTools/Conf/build_rule.template | 42 ++---- BaseTools/Conf/tools_def.template | 157 -------------------= - BaseTools/Scripts/Rvct-Align32.sct | 19 --- BaseTools/Scripts/Rvct-Align4K.sct | 19 --- BaseTools/Source/C/Include/Common/BaseTypes.h | 10 +- BaseTools/Source/Python/AutoGen/BuildEngine.py | 2 +- BaseTools/Source/Python/AutoGen/GenMake.py | 2 +- BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 17 +-- BaseTools/Source/Python/UPT/Library/DataType.py | 1 - 9 files changed, 16 insertions(+), 253 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule= .template index 435662351213..5895b48fd88d 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -128,8 +128,7 @@ "$(CC)" /Fo${dst} $(DEPS_FLAGS) $(CC_FLAGS) $(INC) ${src} =20 - - # For RVCTCYGWIN CC_FLAGS must be first to work around pathing iss= ues + "$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) -c -o ${dst} $(INC) ${src} =20 @@ -145,7 +144,7 @@ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj =20 - + "$(CC)" $(CC_FLAGS) $(CC_XIPFLAGS) -c -o ${dst} $(INC) ${src} =20 [C-Header-File] @@ -157,7 +156,7 @@ =20 [Assembly-Code-File.COMMON.COMMON] - + ?.asm, ?.Asm, ?.ASM =20 @@ -175,16 +174,15 @@ Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_ba= se}.iiii ${d_path}(+)${s_base}.ii "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s= _base}.iiii =20 - + Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src} "$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_= base}.ii Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_p= ath}(+)${s_base}.ii - # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing is= sues "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii =20 [Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64] # Remove --convert-hex for ARM as it breaks MSFT assemblers - + ?.asm, ?.Asm, ?.ASM =20 @@ -208,11 +206,10 @@ Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iiii ${d_p= ath}(+)${s_base}.ii "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s= _base}.iiii =20 - + Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src} "$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_= base}.ii Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_p= ath}(+)${s_base}.ii - # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing is= sues "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii =20 [Nasm-Assembly-Code-File.COMMON.COMMON] @@ -276,13 +273,6 @@ $(RM) ${dst} "$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST) =20 - - "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST) - =20 - - # $(OBJECT_FILES_LIST) has wrong paths for cygwin - "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES) - "$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST) =20 @@ -307,13 +297,6 @@ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LI= BRARY_FILES_LIST),--end-group $(CC_FLAGS) $(DLINK2_FLAGS) "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} =20 - - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_= LIBRARY_FILES_LIST) $(DLINK2_FLAGS) - - - #$(STATIC_LIBRARY_FILES_LIST) has wrong paths for cygwin - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRAR= Y_FILES) $(DLINK2_FLAGS) - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STA= TIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) =20 @@ -349,13 +332,6 @@ "$(DLINK)" $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILE= S_LIST),--end-group $(DLINK2_FLAGS) =20 - - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_= LIBRARY_FILES_LIST) $(DLINK2_FLAGS) - - - #$(STATIC_LIBRARY_FILES_LIST) has the wrong paths for cygwin - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRAR= Y_FILES) $(DLINK2_FLAGS) - "$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(ST= ATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) =20 @@ -369,7 +345,7 @@ $(DEBUG_DIR)(+)$(MODULE_NAME).efi $(OUTPUT_DIR)(+)$(MODULE_NAME).map =20 - + "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) $(CP) ${dst} $(DEBUG_DIR) $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi @@ -661,7 +637,7 @@ $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib =20 - + $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc =20 @@ -671,5 +647,5 @@ "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} - + "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) diff --git a/BaseT= ools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 9c310cf23d25..5ed19810b727 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -333,24 +333,6 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler (iasl.exe) from # https://acpica.org/downloads -# RVCT -win- Requires: -# ARM C/C++ Compiler, 5.00 -# Optional: -# Required to build EBC drivers: -# Intel(r) Compiler for Efi Byte Code (Intel= (r) EBC Compiler) -# Required to build platforms or ACPI tables: -# Microsoft ASL ACPI Compiler (asl.exe) v4.0= .0 from -# http://download.microsoft.com/download/2/c= /1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi -# Notes: Since this tool chain is obsolete, it does= n't enable the compiler option for included header file list generation, -# and lose the incremental build capability. -# RVCTLINUX -unix- Requires: -# ARM C/C++ Compiler, 5.00 -# Optional: -# Required to build platforms or ACPI tables: -# Intel(r) ACPI Compiler from -# https://acpica.org/downloads -# Notes: Since this tool chain is obsolete, it does= n't enable the compiler option for included header file list generation, -# and lose the incremental build capability. # * Commented out - All versions of VS2005 use the same standard install d= irectory # ##############################################################= ###################### @@ -361,7 +343,6 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # MSFT - Microsoft # GCC - GNU GCC # INTEL - INTEL -# RVCT - ARM RealView Toolchain ##########################################################################= ########## ##########################################################################= ########## # @@ -3012,144 +2993,6 @@ RELEASE_XCODE5_X64_ASM_FLAGS =3D -arch x86_64 NOOPT_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -g -gdw= arf -O0 -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno= -ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implici= t-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missi= ng-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-vara= rgs -ftrap-function=3Dundefined_behavior_has_been_optimized_away_by_clang -= D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS) RELEASE_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -Os = -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-exte= nsions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float = -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field= -initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno= -unused-const-variable -ftrap-function=3Dundefined_behavior_has_been_optimi= zed_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS) =20 -##########################################################################= ########## -# -# RVCT Common -# -##########################################################################= ########## - -DEFINE RVCT_ALL_ASM_FLAGS =3D --diag_suppress=3D1786 --diag_error=3Dwarn= ing --apcs /interwork -DEFINE RVCT_ALL_CC_FLAGS =3D --c90 --no_autoinline --asm --gnu --apcs /= interwork --signed_chars --no_unaligned_access --split_sections --enum_is_i= nt --preinclude AutoGen.h --diag_suppress=3D186,188,1,111,68 --diag_warning= 167 --diag_error=3Dwarning --diag_style=3Dide --protect_stack -DEFINE RVCT_ALL_DLINK_FLAGS =3D --no_scanlib --no_exceptions --datacompres= sor off --strict --symbols --diag_style=3Dide --no_legacyalign --scatter $(= EDK_TOOLS_PATH)/Scripts/Rvct-Align32.sct - -##########################################################################= ########## -# -# ARM RealView Tools - Windows -# -##########################################################################= ########## -# RVCT - Tools from ARM - -*_RVCT_*_*_FAMILY =3D RVCT - -# -# Use default values, or override in DSC file -# -*_RVCT_ARM_ARCHCC_FLAGS =3D --thumb --fpu=3Dsoftvfp -*_RVCT_ARM_ARCHASM_FLAGS =3D -*_RVCT_ARM_ARCHDLINK_FLAGS =3D -*_RVCT_ARM_PLATFORM_FLAGS =3D --cpu 7-A - - DEBUG_RVCT_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK= _FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_= NAME).map -RELEASE_RVCT_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK= _FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_= NAME).map - - -*_RVCT_ARM_ASM_FLAGS =3D $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT= _ALL_ASM_FLAGS) -*_RVCT_ARM_PP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --prei= nclude AutoGen.h -*_RVCT_ARM_VFRPP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFR= COMPILE --preinclude $(MODULE_NAME)StrDefs.h -*_RVCT_ARM_MAKE_PATH =3D nmake /NOLOGO -*_RVCT_ARM_SLINK_FLAGS =3D --partial -o - DEBUG_RVCT_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_= ALL_CC_FLAGS) -O1 -g -RELEASE_RVCT_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLAT= FORM_FLAGS) --diag_suppress=3D550 DEF(RVCT_ALL_CC_FLAGS) -O2 - -################## -# ARM definitions -################## -*_RVCT_ARM_CC_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCT_ARM_SLINK_PATH =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCT_ARM_DLINK_PATH =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCT_ARM_ASM_PATH =3D ENV(RVCT_TOOLS_PATH)armasm -*_RVCT_ARM_PP_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCT_ARM_VFRPP_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCT_ARM_FROMELF_PATH =3D ENV(RVCT_TOOLS_PATH)fromelf - -##########################################################################= ########## -# -# ARM RealView Tools - Linux -# -##########################################################################= ########## -# RVCTLINUX - Tools from ARM in a Cygwin environment -*_RVCTLINUX_*_*_FAMILY =3D RVCT -*_RVCTLINUX_*_*_BUILDRULEFAMILY =3D RVCTLINUX - -*_RVCTLINUX_*_MAKE_PATH =3D make - -# -# Use default values, or override in DSC file -# -*_RVCTLINUX_ARM_ARCHCC_FLAGS =3D --thumb --fpu=3Dsoftvfp -*_RVCTLINUX_ARM_ARCHASM_FLAGS =3D -*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =3D -*_RVCTLINUX_ARM_PLATFORM_FLAGS =3D --cpu 7-A - -DEBUG_RVCTLINUX_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DL= INK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BA= SE_NAME).map -RELEASE_RVCTLINUX_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DL= INK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BA= SE_NAME).map - -*_RVCTLINUX_ARM_ASM_FLAGS =3D $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF= (RVCT_ALL_ASM_FLAGS) -*_RVCTLINUX_ARM_PP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -*_RVCTLINUX_ARM_VFRPP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E = -DVFRCOMPILE --preinclude $(MODULE_NAME)StrDefs.h -*_RVCTLINUX_ARM_SLINK_FLAGS =3D --partial -o - DEBUG_RVCTLINUX_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(= RVCT_ALL_CC_FLAGS) -O1 -g -RELEASE_RVCTLINUX_ARM_CC_FLAGS =3D $(ARCHCC_FLA= GS) $(PLATFORM_FLAGS) --diag_suppress=3D550 DEF(RVCT_ALL_CC_FLAGS) -O2 - -################## -# ARM definitions -################## -*_RVCTLINUX_ARM_CC_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTLINUX_ARM_SLINK_PATH =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCTLINUX_ARM_DLINK_PATH =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCTLINUX_ARM_ASM_PATH =3D ENV(RVCT_TOOLS_PATH)armasm -*_RVCTLINUX_ARM_PP_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTLINUX_ARM_VFRPP_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTLINUX_ARM_FROMELF_PATH =3D ENV(RVCT_TOOLS_PATH)fromelf - -##########################################################################= ########## -# -# ARM RealView Tools - Cygwin -# -##########################################################################= ########## -# ARMCYGWIN - Tools from ARM in a Cygwin environment - -*_RVCTCYGWIN_*_*_FAMILY =3D RVCT -*_RVCTCYGWIN_*_*_BUILDRULEFAMILY =3D RVCTCYGWIN - -*_RVCTCYGWIN_ARM_CCPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTCYGWIN_ARM_SLINKPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCTCYGWIN_ARM_DLINKPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCTCYGWIN_ARM_ASMPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armasm -*_RVCTCYGWIN_ARM_PPPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)fromelf - -# -# Use default values, or override in DSC file -# -*_RVCTCYGWIN_ARM_ARCHCC_FLAGS =3D --thumb --fpu=3Dsoftvfp -*_RVCTCYGWIN_ARM_ARCHASM_FLAGS =3D -*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =3D -*_RVCTCYGWIN_ARM_PLATFORM_FLAGS =3D --cpu 7-A - - DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS =3D "$(DLINKPATH_FLAG)" $(ARCHDLINK= _FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list= `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` -RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS =3D "$(DLINKPATH_FLAG)" $(ARCHDLINK= _FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list= `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` - -*_RVCTCYGWIN_ARM_ASM_FLAGS =3D "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(= PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS) -*_RVCTCYGWIN_ARM_PP_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) -E -*_RVCTCYGWIN_ARM_VFRPP_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(MODULE_NAME)StrDe= fs.h` -*_RVCTCYGWIN_ARM_MAKE_PATH =3D make -*_RVCTCYGWIN_ARM_SLINK_FLAGS =3D "$(SLINKPATH_FLAG)" --partial -o - DEBUG_RVCTCYGWIN_ARM_CC_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g -RELEASE_RVCTCYGWIN_ARM_CC_FLAG= S =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress= =3D550 DEF(RVCT_ALL_CC_FLAGS) -O2 - -################## -# ARM definitions -################## -*_RVCTCYGWIN_ARM_CC_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_SLINK_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_DLINK_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_ASM_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_PP_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_VFRPP_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_FROMELF_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py - ################# # ASM 16 linker definitions ################# diff --git a/BaseTools/Scripts/Rvct-Align32.sct b/BaseTools/Scripts/Rvct-Al= ign32.sct deleted file mode 100644 index d0969a1a9633..000000000000 --- a/BaseTools/Scripts/Rvct-Align32.sct +++ /dev/null @@ -1,19 +0,0 @@ -/** @file - - Copyright (c) 2015, Linaro Ltd. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -REGION 0x220 RELOC { - ER_RO +0 ALIGN 32 { - * (+RO) - } - ER_RW +0 ALIGN 32 { - * (+RW) - } - ER_ZI +0 { - * (+ZI) - } -} diff --git a/BaseTools/Scripts/Rvct-Align4K.sct b/BaseTools/Scripts/Rvct-Al= ign4K.sct deleted file mode 100644 index bf3738ac1cb4..000000000000 --- a/BaseTools/Scripts/Rvct-Align4K.sct +++ /dev/null @@ -1,19 +0,0 @@ -/** @file - - Copyright (c) 2015, Linaro Ltd. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -REGION 0x1000 RELOC { - ER_RO +0 ALIGN 4096 { - * (+RO) - } - ER_RW +0 ALIGN 4096 { - * (+RW) - } - ER_ZI +0 { - * (+ZI) - } -} diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Sour= ce/C/Include/Common/BaseTypes.h index 150980b4c0bf..e669da894c32 100644 --- a/BaseTools/Source/C/Include/Common/BaseTypes.h +++ b/BaseTools/Source/C/Include/Common/BaseTypes.h @@ -57,15 +57,7 @@ #define NULL ((VOID *) 0) #endif =20 -#ifdef __CC_ARM - // - // Older RVCT ARM compilers don't fully support #pragma pack and require= __packed - // as a prefix for the structure. - // - #define PACKED __packed -#else - #define PACKED -#endif +#define PACKED =20 // // Support for variable length argument lists using the ANSI standard. diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Sou= rce/Python/AutoGen/BuildEngine.py index 722fead75af6..752a1a1f6a86 100644 --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py @@ -317,7 +317,7 @@ class BuildRule: # @param LineIndex The line number from which the parsing= will begin # @param SupportedFamily The list of supported tool chain famil= ies # - def __init__(self, File=3DNone, Content=3DNone, LineIndex=3D0, Support= edFamily=3D[TAB_COMPILER_MSFT, "INTEL", "GCC", "RVCT"]): + def __init__(self, File=3DNone, Content=3DNone, LineIndex=3D0, Support= edFamily=3D[TAB_COMPILER_MSFT, "INTEL", "GCC"]): self.RuleFile =3D File # Read build rules from file if it's not none if File is not None: diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index e55efff059f9..da406e6ff468 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -166,7 +166,7 @@ class BuildFile(object): GMAKE_FILETYPE : "include" } =20 - _INC_FLAG_ =3D {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I"= , "RVCT" : "-I", "NASM" : "-I"} + _INC_FLAG_ =3D {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" :=20 + "-I", "NASM" : "-I"} =20 ## Constructor of BuildFile # diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/S= ource/Python/AutoGen/ModuleAutoGen.py index 368a31047e82..d05410b32966 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -32,7 +32,7 @@ import tempfile ## Mapping Makefile type gMakeTypeMap =3D {TAB_COMPILER_MSFT:"nmake", "GCC":"gmake"} # -# Regular = expression for finding Include Directories, the difference between MSFT and= INTEL/GCC/RVCT +# Regular expression for finding Include Directories, the difference=20 +between MSFT and INTEL/GCC # is the former use /I , the Latter used -I to specify include directories= # gBuildOptIncludePatternMsft =3D re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", = re.MULTILINE | re.DOTALL) @@ -684,12 +684,12 @@ class ModuleAutoGen(AutoGen= ): @cached_property def BuildOptionIncPathList(self): # - # Regular expression for finding Include Directories, the differen= ce between MSFT and INTEL/GCC/RVCT + # Regular expression for finding Include Directories, the=20 + difference between MSFT and INTEL/GCC # is the former use /I , the Latter used -I to specify include dir= ectories # if self.PlatformInfo.ToolChainFamily in (TAB_COMPILER_MSFT): BuildOptIncludeRegEx =3D gBuildOptIncludePatternMsft - elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC', 'RVCT')= : + elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC'): BuildOptIncludeRegEx =3D gBuildOptIncludePatternOther else: # @@ -704,16 +704,7 @@ class ModuleAutoGen(AutoGen): except KeyError: FlagOption =3D '' =20 - if self.ToolChainFamily !=3D 'RVCT': - IncPathList =3D [NormPath(Path, self.Macros) for Path in B= uildOptIncludeRegEx.findall(FlagOption)] - else: - # - # RVCT may specify a list of directory seperated by commas - # - IncPathList =3D [] - for Path in BuildOptIncludeRegEx.findall(FlagOption): - PathList =3D GetSplitList(Path, TAB_COMMA_SPLIT) - IncPathList.extend(NormPath(PathEntry, self.Macros) fo= r PathEntry in PathList) + IncPathList =3D [NormPath(Path, self.Macros) for Path in=20 + BuildOptIncludeRegEx.findall(FlagOption)] =20 # # EDK II modules must not reference header files outside of th= e packages they depend on or diff --git a/BaseTools/Source/Python/UPT/Libra= ry/DataType.py b/BaseTools/Source/Python/UPT/Library/DataType.py index bd216786a565..2033149aa6dc 100644 --- a/BaseTools/Source/Python/UPT/Library/DataType.py +++ b/BaseTools/Source/Python/UPT/Library/DataType.py @@ -939,7 +939,6 @@ MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF =3D 5014 T= OOL_FAMILY_LIST =3D ["MSFT", "INTEL", "GCC", - "RVCT" ] =20 TYPE_HOB_SECTION =3D 'HOB' -- 2.35.3