From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=RsDWsigh; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: baptiste.gerondeau@linaro.org) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by groups.io with SMTP; Wed, 18 Sep 2019 09:06:01 -0700 Received: by mail-wm1-f66.google.com with SMTP id 5so786659wmg.0 for ; Wed, 18 Sep 2019 09:06:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ej0dF8f4DojJCE0faw9INKIY8KbGsEl9TEp4WRpK2F4=; b=RsDWsigh41hxPmrjYToC9an2vFo23FUy8nCG0IkXA3mcYkNDdILX9AZ7CWMq//zrVv XtjBKZh4e0bxEeJ3oi1wAqQiqXvgNy+D2NGUGUgjZf1qnIc3+QwG3ZjZG0C8MPc0lAEQ dzk94HbsxD3Oo2OQg+ETmT+Nf6VLioPmDjA5ge5AcUMRGlIccx7zHnH0q16IXBuAaK/h k+6g/TDmD0mki5NCtfPSKF0FaxZvSQEV60MSO7wNXXkhgkOzDVQtmNuB3mpsdS4GjiNR zzXL52ZZFDymMh1jZhj7HsXGxSjOCbRMWdJnlb/v9KvqcyzUwBlwRCN+2h1OWhrNnBQ1 EmOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ej0dF8f4DojJCE0faw9INKIY8KbGsEl9TEp4WRpK2F4=; b=UB9mR53J5cRM2jbeJ+++Mbez5QT2tlisOX24EwccnFWWJk5Js91SzsJC8ZTAy4qEQM HSUnpAVlEFRTov4GqJiACYcaqMGoSBxq7Yrq7yWQT2DF6cQl/PdEEKXw4TCLDyF+JrIH pkiSwXHnrn1Tiy3hVgFPfuopwXdHQLUYZVMlJpyOrrBMbe25QCSWTXmf5xWDvinZc5F0 U5AxM1B0NSR5uxXHS3Wjl0K5i3WrHP/zvHgEbKX8iG66qUhlWOjOONvjn4O2SnPmtF7D OfxJpUPqkY9x70S4gGbIZCdv4+/v9E67r/0OTyVvtufLDCrQOQIAaOQEkIJOA60iiDZy ko9g== X-Gm-Message-State: APjAAAU7qYC5jAcQsWVBjuIiOeBYHwK3CPhU1w/EcGVI6zk62UEoRwX+ w1bsvzwF3Ai6Zlta3UEfNKys3sUfOmhKVQ== X-Google-Smtp-Source: APXvYqxzrsb29PuYYDCcZABEixu0exmy6QaNCNUlEuCt84ixE8aTzKOSBHOqoPDaD88eVBsmyj/mwQ== X-Received: by 2002:a1c:2d85:: with SMTP id t127mr3756406wmt.81.1568822759107; Wed, 18 Sep 2019 09:05:59 -0700 (PDT) Return-Path: Received: from localhost.localdomain (176-169-168-38.abo.bbox.fr. [176.169.168.38]) by smtp.gmail.com with ESMTPSA id y186sm5035863wmb.41.2019.09.18.09.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 09:05:58 -0700 (PDT) From: "Baptiste Gerondeau" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, michael.d.kinney@intel.com, liming.gao@intel.com, shenglei.zhang@intel.com, Baptiste Gerondeau Subject: [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build Date: Wed, 18 Sep 2019 18:05:24 +0200 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Baptiste GERONDEAU BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1750" Since RVCT shares the same assembler syntax as MSFT, use .asm files and associate them with MSFT, which would be a first step to addressing the above Bugzilla issue. RVCT will also have to be erased from BaseTools/rest of the build infrastructure, to fully address BZ#1750 ; this patch only addresses the "code" in itself. Signed-off-by: Baptiste Gerondeau --- ArmPkg/Drivers/ArmGic/ArmGicLib.inf | 2 = +- ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf | 2 = +- ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf | 2 = +- ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf | 2 = +- ArmPkg/Library/ArmLib/ArmBaseLib.inf | 8 = ++++---- ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 = +- ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf | 2 = +- ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 2 = +- ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf | 2 = +- ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf | 2 = +- ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf | 2 = +- ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 6 = +++--- ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 6 = +++--- ArmPlatformPkg/PrePi/PeiMPCore.inf | 2 = +- ArmPlatformPkg/PrePi/PeiUniCore.inf | 2 = +- MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf | 2 = +- MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf | 10 = +++++----- MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf | 2 = +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf b/ArmPkg/Drivers/ArmGic/Ar= mGicLib.inf index 5e23c732bfab..4fccb938eb6d 100644 --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf @@ -22,7 +22,7 @@ [Sources] =0D [Sources.ARM]=0D GicV3/Arm/ArmGicV3.S | GCC=0D - GicV3/Arm/ArmGicV3.asm | RVCT=0D + GicV3/Arm/ArmGicV3.asm | MSFT=0D =0D [Sources.AARCH64]=0D GicV3/AArch64/ArmGicV3.S=0D diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf b/ArmPkg/Li= brary/ArmExceptionLib/ArmExceptionLib.inf index fdb9c24d21bc..58b2ddbff858 100644 --- a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf +++ b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf @@ -33,7 +33,7 @@ [Sources.common] =0D [Sources.Arm]=0D Arm/ArmException.c=0D - Arm/ExceptionSupport.asm | RVCT=0D + Arm/ExceptionSupport.asm | MSFT=0D Arm/ExceptionSupport.S | GCC=0D =0D [Sources.AARCH64]=0D diff --git a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf b/A= rmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf index ef1a43a27c45..a404ca2ccf82 100644 --- a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf +++ b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf @@ -28,7 +28,7 @@ [Sources.common] =0D [Sources.Arm]=0D Arm/ArmException.c=0D - Arm/ExceptionSupport.asm | RVCT=0D + Arm/ExceptionSupport.asm | MSFT=0D Arm/ExceptionSupport.S | GCC=0D =0D [Sources.AARCH64]=0D diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvc= Lib/ArmHvcLib.inf index 69f68f63d7a6..be8d8a228865 100644 --- a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf +++ b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf @@ -15,7 +15,7 @@ [Defines] LIBRARY_CLASS =3D ArmHvcLib=0D =0D [Sources.ARM]=0D - Arm/ArmHvc.asm | RVCT=0D + Arm/ArmHvc.asm | MSFT=0D Arm/ArmHvc.S | GCC=0D =0D [Sources.AARCH64]=0D diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/A= rmBaseLib.inf index 5e70990872f2..63e175623393 100644 --- a/ArmPkg/Library/ArmLib/ArmBaseLib.inf +++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf @@ -30,10 +30,10 @@ [Sources.ARM] Arm/ArmV7Support.S | GCC=0D Arm/ArmV7ArchTimerSupport.S | GCC=0D =0D - Arm/ArmLibSupport.asm | RVCT=0D - Arm/ArmLibSupportV7.asm | RVCT=0D - Arm/ArmV7Support.asm | RVCT=0D - Arm/ArmV7ArchTimerSupport.asm | RVCT=0D + Arm/ArmLibSupport.asm | MSFT=0D + Arm/ArmLibSupportV7.asm | MSFT=0D + Arm/ArmV7Support.asm | MSFT=0D + Arm/ArmV7ArchTimerSupport.asm | MSFT=0D =0D [Sources.AARCH64]=0D AArch64/AArch64Lib.h=0D diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/Ar= mMmuLib/ArmMmuBaseLib.inf index 33dddf1e2b97..44366f02c6d9 100644 --- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf @@ -23,7 +23,7 @@ [Sources.AARCH64] [Sources.ARM]=0D Arm/ArmMmuLibCore.c=0D Arm/ArmMmuLibV7Support.S | GCC=0D - Arm/ArmMmuLibV7Support.asm |RVCT =0D + Arm/ArmMmuLibV7Support.asm | MSFT=0D =0D [Packages]=0D ArmPkg/ArmPkg.dec=0D diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmc= Lib/ArmSmcLib.inf index 4f4b09f4528a..af8c0e53cc2b 100644 --- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf +++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf @@ -14,7 +14,7 @@ [Defines] LIBRARY_CLASS =3D ArmSmcLib=0D =0D [Sources.ARM]=0D - Arm/ArmSmc.asm | RVCT=0D + Arm/ArmSmc.asm | MSFT=0D Arm/ArmSmc.S | GCC=0D =0D [Sources.AARCH64]=0D diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemL= ib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.i= nf index fa19bf649131..f4c9e5510b9a 100644 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf @@ -21,7 +21,7 @@ [Sources.AARCH64] =0D [Sources.ARM]=0D Arm/Reset.S | GCC=0D - Arm/Reset.asm | RVCT=0D + Arm/Reset.asm | MSFT=0D =0D [Sources]=0D ArmSmcPsciResetSystemLib.c=0D diff --git a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf b/ArmPkg/Library/ArmSvc= Lib/ArmSvcLib.inf index 744a29fbf723..6631e40df130 100644 --- a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf +++ b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf @@ -14,7 +14,7 @@ [Defines] LIBRARY_CLASS =3D ArmSvcLib=0D =0D [Sources.ARM]=0D - Arm/ArmSvc.asm | RVCT=0D + Arm/ArmSvc.asm | MSFT=0D Arm/ArmSvc.S | GCC=0D =0D [Sources.AARCH64]=0D diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.i= nf b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf index e0d0028d8224..cc791a3a68fd 100644 --- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf +++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf @@ -29,7 +29,7 @@ [Sources.common] =0D [Sources.Arm]=0D Arm/ArmPlatformHelper.S | GCC=0D - Arm/ArmPlatformHelper.asm | RVCT=0D + Arm/ArmPlatformHelper.asm | MSFT=0D =0D [Sources.AArch64]=0D AArch64/ArmPlatformHelper.S=0D diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib= .inf b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf index 76f809c80d9f..e88330c1c382 100644 --- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf +++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf @@ -21,7 +21,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec=0D =0D [Sources.ARM]=0D - Arm/ArmPlatformStackLib.asm | RVCT=0D + Arm/ArmPlatformStackLib.asm | MSFT=0D Arm/ArmPlatformStackLib.S | GCC=0D =0D [Sources.AARCH64]=0D diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPk= g/PrePeiCore/PrePeiCoreMPCore.inf index f2ac45d171bc..b663ff749182 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf @@ -21,11 +21,11 @@ [Sources.common] =0D [Sources.ARM]=0D Arm/ArchPrePeiCore.c=0D - Arm/PrePeiCoreEntryPoint.asm | RVCT=0D + Arm/PrePeiCoreEntryPoint.asm | MSFT=0D Arm/PrePeiCoreEntryPoint.S | GCC=0D - Arm/SwitchStack.asm | RVCT=0D + Arm/SwitchStack.asm | MSFT=0D Arm/SwitchStack.S | GCC=0D - Arm/Exception.asm | RVCT=0D + Arm/Exception.asm | MSFT=0D Arm/Exception.S | GCC=0D =0D [Sources.AARCH64]=0D diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformP= kg/PrePeiCore/PrePeiCoreUniCore.inf index 84c319c3679b..6d05ed096c4c 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf @@ -21,11 +21,11 @@ [Sources.common] =0D [Sources.ARM]=0D Arm/ArchPrePeiCore.c=0D - Arm/PrePeiCoreEntryPoint.asm | RVCT=0D + Arm/PrePeiCoreEntryPoint.asm | MSFT=0D Arm/PrePeiCoreEntryPoint.S | GCC=0D - Arm/SwitchStack.asm | RVCT=0D + Arm/SwitchStack.asm | MSFT=0D Arm/SwitchStack.S | GCC=0D - Arm/Exception.asm | RVCT=0D + Arm/Exception.asm | MSFT=0D Arm/Exception.S | GCC=0D =0D [Sources.AARCH64]=0D diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiM= PCore.inf index 9c5da0d42a7b..fd2a35e59591 100644 --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf @@ -22,7 +22,7 @@ [Sources] [Sources.ARM]=0D Arm/ArchPrePi.c=0D Arm/ModuleEntryPoint.S | GCC=0D - Arm/ModuleEntryPoint.asm | RVCT=0D + Arm/ModuleEntryPoint.asm | MSFT=0D =0D [Sources.AArch64]=0D AArch64/ArchPrePi.c=0D diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/Pei= UniCore.inf index ee9b05b25337..de3abadfeac6 100644 --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf @@ -22,7 +22,7 @@ [Sources] [Sources.ARM]=0D Arm/ArchPrePi.c=0D Arm/ModuleEntryPoint.S | GCC=0D - Arm/ModuleEntryPoint.asm | RVCT=0D + Arm/ModuleEntryPoint.asm | MSFT=0D =0D [Sources.AArch64]=0D AArch64/ArchPrePi.c=0D diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.in= f b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf index ad68f841fb6b..62b46377116c 100644 --- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf +++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf @@ -31,7 +31,7 @@ [Sources] [Sources.ARM]=0D IoLibArmVirt.c=0D Arm/ArmVirtMmio.S | GCC=0D - Arm/ArmVirtMmio.asm | RVCT=0D + Arm/ArmVirtMmio.asm | MSFT=0D =0D [Sources.AARCH64]=0D IoLibArmVirt.c=0D diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/M= dePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf index d38e1397eee1..79ba2a2dfc39 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf +++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf @@ -85,11 +85,11 @@ [Sources.ARM] Arm/CompareMem.S | GCC=0D Arm/CompareGuid.S | GCC=0D =0D - Arm/ScanMem.asm |RVCT=0D - Arm/SetMem.asm |RVCT=0D - Arm/CopyMem.asm |RVCT=0D - Arm/CompareMem.asm |RVCT=0D - Arm/CompareGuid.asm |RVCT=0D + Arm/ScanMem.asm | MSFT=0D + Arm/SetMem.asm | MSFT=0D + Arm/CopyMem.asm | MSFT=0D + Arm/CompareMem.asm | MSFT=0D + Arm/CompareGuid.asm | MSFT=0D =0D [Sources.AARCH64]=0D AArch64/ScanMem.S=0D diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.i= nf b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf index 446bc19b63eb..39c503a28a2c 100755 --- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf +++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf @@ -70,7 +70,7 @@ [Sources.EBC] =0D [Sources.ARM]=0D Synchronization.c=0D - Arm/Synchronization.asm | RVCT=0D + Arm/Synchronization.asm | MSFT=0D Arm/Synchronization.S | GCC=0D =0D [Sources.AARCH64]=0D --=20 2.23.0