Arm builds on Visual Studio

[edk2-devel] [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build

Posted by Baptiste Gerondeau 6 years, 4 months ago

From: Baptiste GERONDEAU <bgerondeau@gmail.com>

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"

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 <baptiste.gerondeau@linaro.org>
---
 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/ArmGicLib.inf
index 5e23c732bfab..4fccb938eb6d 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
@@ -22,7 +22,7 @@ [Sources]
 
 [Sources.ARM]
   GicV3/Arm/ArmGicV3.S     | GCC
-  GicV3/Arm/ArmGicV3.asm   | RVCT
+  GicV3/Arm/ArmGicV3.asm   | MSFT
 
 [Sources.AARCH64]
   GicV3/AArch64/ArmGicV3.S
diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf b/ArmPkg/Library/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]
 
 [Sources.Arm]
   Arm/ArmException.c
-  Arm/ExceptionSupport.asm | RVCT
+  Arm/ExceptionSupport.asm | MSFT
   Arm/ExceptionSupport.S   | GCC
 
 [Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf b/ArmPkg/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]
 
 [Sources.Arm]
   Arm/ArmException.c
-  Arm/ExceptionSupport.asm | RVCT
+  Arm/ExceptionSupport.asm | MSFT
   Arm/ExceptionSupport.S   | GCC
 
 [Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/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                  = ArmHvcLib
 
 [Sources.ARM]
-  Arm/ArmHvc.asm    | RVCT
+  Arm/ArmHvc.asm    | MSFT
   Arm/ArmHvc.S      | GCC
 
 [Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.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
   Arm/ArmV7ArchTimerSupport.S   | GCC
 
-  Arm/ArmLibSupport.asm         | RVCT
-  Arm/ArmLibSupportV7.asm       | RVCT
-  Arm/ArmV7Support.asm          | RVCT
-  Arm/ArmV7ArchTimerSupport.asm | RVCT
+  Arm/ArmLibSupport.asm         | MSFT
+  Arm/ArmLibSupportV7.asm       | MSFT
+  Arm/ArmV7Support.asm          | MSFT
+  Arm/ArmV7ArchTimerSupport.asm | MSFT
 
 [Sources.AARCH64]
   AArch64/AArch64Lib.h
diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/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]
   Arm/ArmMmuLibCore.c
   Arm/ArmMmuLibV7Support.S   | GCC
-  Arm/ArmMmuLibV7Support.asm |RVCT 
+  Arm/ArmMmuLibV7Support.asm | MSFT
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/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                  = ArmSmcLib
 
 [Sources.ARM]
-  Arm/ArmSmc.asm    | RVCT
+  Arm/ArmSmc.asm    | MSFT
   Arm/ArmSmc.S      | GCC
 
 [Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
index fa19bf649131..f4c9e5510b9a 100644
--- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
@@ -21,7 +21,7 @@ [Sources.AARCH64]
 
 [Sources.ARM]
   Arm/Reset.S       | GCC
-  Arm/Reset.asm     | RVCT
+  Arm/Reset.asm     | MSFT
 
 [Sources]
   ArmSmcPsciResetSystemLib.c
diff --git a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf b/ArmPkg/Library/ArmSvcLib/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                  = ArmSvcLib
 
 [Sources.ARM]
-  Arm/ArmSvc.asm    | RVCT
+  Arm/ArmSvc.asm    | MSFT
   Arm/ArmSvc.S      | GCC
 
 [Sources.AARCH64]
diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf 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]
 
 [Sources.Arm]
   Arm/ArmPlatformHelper.S    | GCC
-  Arm/ArmPlatformHelper.asm  | RVCT
+  Arm/ArmPlatformHelper.asm  | MSFT
 
 [Sources.AArch64]
   AArch64/ArmPlatformHelper.S
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
 
 [Sources.ARM]
-  Arm/ArmPlatformStackLib.asm     | RVCT
+  Arm/ArmPlatformStackLib.asm     | MSFT
   Arm/ArmPlatformStackLib.S       | GCC
 
 [Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index f2ac45d171bc..b663ff749182 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -21,11 +21,11 @@ [Sources.common]
 
 [Sources.ARM]
   Arm/ArchPrePeiCore.c
-  Arm/PrePeiCoreEntryPoint.asm | RVCT
+  Arm/PrePeiCoreEntryPoint.asm | MSFT
   Arm/PrePeiCoreEntryPoint.S   | GCC
-  Arm/SwitchStack.asm      | RVCT
+  Arm/SwitchStack.asm      | MSFT
   Arm/SwitchStack.S        | GCC
-  Arm/Exception.asm        | RVCT
+  Arm/Exception.asm        | MSFT
   Arm/Exception.S          | GCC
 
 [Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index 84c319c3679b..6d05ed096c4c 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -21,11 +21,11 @@ [Sources.common]
 
 [Sources.ARM]
   Arm/ArchPrePeiCore.c
-  Arm/PrePeiCoreEntryPoint.asm | RVCT
+  Arm/PrePeiCoreEntryPoint.asm | MSFT
   Arm/PrePeiCoreEntryPoint.S   | GCC
-  Arm/SwitchStack.asm      | RVCT
+  Arm/SwitchStack.asm      | MSFT
   Arm/SwitchStack.S        | GCC
-  Arm/Exception.asm        | RVCT
+  Arm/Exception.asm        | MSFT
   Arm/Exception.S          | GCC
 
 [Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index 9c5da0d42a7b..fd2a35e59591 100644
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -22,7 +22,7 @@ [Sources]
 [Sources.ARM]
   Arm/ArchPrePi.c
   Arm/ModuleEntryPoint.S   | GCC
-  Arm/ModuleEntryPoint.asm | RVCT
+  Arm/ModuleEntryPoint.asm | MSFT
 
 [Sources.AArch64]
   AArch64/ArchPrePi.c
diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index ee9b05b25337..de3abadfeac6 100644
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -22,7 +22,7 @@ [Sources]
 [Sources.ARM]
   Arm/ArchPrePi.c
   Arm/ModuleEntryPoint.S   | GCC
-  Arm/ModuleEntryPoint.asm | RVCT
+  Arm/ModuleEntryPoint.asm | MSFT
 
 [Sources.AArch64]
   AArch64/ArchPrePi.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf 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]
   IoLibArmVirt.c
   Arm/ArmVirtMmio.S       | GCC
-  Arm/ArmVirtMmio.asm     | RVCT
+  Arm/ArmVirtMmio.asm     | MSFT
 
 [Sources.AARCH64]
   IoLibArmVirt.c
diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/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
   Arm/CompareGuid.S   | GCC
 
-  Arm/ScanMem.asm     |RVCT
-  Arm/SetMem.asm      |RVCT
-  Arm/CopyMem.asm     |RVCT
-  Arm/CompareMem.asm  |RVCT
-  Arm/CompareGuid.asm |RVCT
+  Arm/ScanMem.asm     | MSFT
+  Arm/SetMem.asm      | MSFT
+  Arm/CopyMem.asm     | MSFT
+  Arm/CompareMem.asm  | MSFT
+  Arm/CompareGuid.asm | MSFT
 
 [Sources.AARCH64]
   AArch64/ScanMem.S
diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf 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]
 
 [Sources.ARM]
   Synchronization.c
-  Arm/Synchronization.asm       | RVCT
+  Arm/Synchronization.asm       | MSFT
   Arm/Synchronization.S         | GCC
 
 [Sources.AARCH64]
-- 
2.23.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47481): https://edk2.groups.io/g/devel/message/47481
Mute This Topic: https://groups.io/mt/34187300/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build

Posted by Ard Biesheuvel 6 years, 4 months ago

On Wed, 18 Sep 2019 at 15:27, Baptiste Gerondeau
<baptiste.gerondeau@linaro.org> wrote:
>
> From: Baptiste GERONDEAU <bgerondeau@gmail.com>
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"
>
> 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 <baptiste.gerondeau@linaro.org>

The changes look fine to me, but please split them out per package as
Liming suggested.

> ---
>  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/ArmGicLib.inf
> index 5e23c732bfab..4fccb938eb6d 100644
> --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> @@ -22,7 +22,7 @@ [Sources]
>
>  [Sources.ARM]
>    GicV3/Arm/ArmGicV3.S     | GCC
> -  GicV3/Arm/ArmGicV3.asm   | RVCT
> +  GicV3/Arm/ArmGicV3.asm   | MSFT
>
>  [Sources.AARCH64]
>    GicV3/AArch64/ArmGicV3.S
> diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf b/ArmPkg/Library/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]
>
>  [Sources.Arm]
>    Arm/ArmException.c
> -  Arm/ExceptionSupport.asm | RVCT
> +  Arm/ExceptionSupport.asm | MSFT
>    Arm/ExceptionSupport.S   | GCC
>
>  [Sources.AARCH64]
> diff --git a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf b/ArmPkg/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]
>
>  [Sources.Arm]
>    Arm/ArmException.c
> -  Arm/ExceptionSupport.asm | RVCT
> +  Arm/ExceptionSupport.asm | MSFT
>    Arm/ExceptionSupport.S   | GCC
>
>  [Sources.AARCH64]
> diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/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                  = ArmHvcLib
>
>  [Sources.ARM]
> -  Arm/ArmHvc.asm    | RVCT
> +  Arm/ArmHvc.asm    | MSFT
>    Arm/ArmHvc.S      | GCC
>
>  [Sources.AARCH64]
> diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.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
>    Arm/ArmV7ArchTimerSupport.S   | GCC
>
> -  Arm/ArmLibSupport.asm         | RVCT
> -  Arm/ArmLibSupportV7.asm       | RVCT
> -  Arm/ArmV7Support.asm          | RVCT
> -  Arm/ArmV7ArchTimerSupport.asm | RVCT
> +  Arm/ArmLibSupport.asm         | MSFT
> +  Arm/ArmLibSupportV7.asm       | MSFT
> +  Arm/ArmV7Support.asm          | MSFT
> +  Arm/ArmV7ArchTimerSupport.asm | MSFT
>
>  [Sources.AARCH64]
>    AArch64/AArch64Lib.h
> diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/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]
>    Arm/ArmMmuLibCore.c
>    Arm/ArmMmuLibV7Support.S   | GCC
> -  Arm/ArmMmuLibV7Support.asm |RVCT
> +  Arm/ArmMmuLibV7Support.asm | MSFT
>
>  [Packages]
>    ArmPkg/ArmPkg.dec
> diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/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                  = ArmSmcLib
>
>  [Sources.ARM]
> -  Arm/ArmSmc.asm    | RVCT
> +  Arm/ArmSmc.asm    | MSFT
>    Arm/ArmSmc.S      | GCC
>
>  [Sources.AARCH64]
> diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> index fa19bf649131..f4c9e5510b9a 100644
> --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> @@ -21,7 +21,7 @@ [Sources.AARCH64]
>
>  [Sources.ARM]
>    Arm/Reset.S       | GCC
> -  Arm/Reset.asm     | RVCT
> +  Arm/Reset.asm     | MSFT
>
>  [Sources]
>    ArmSmcPsciResetSystemLib.c
> diff --git a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf b/ArmPkg/Library/ArmSvcLib/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                  = ArmSvcLib
>
>  [Sources.ARM]
> -  Arm/ArmSvc.asm    | RVCT
> +  Arm/ArmSvc.asm    | MSFT
>    Arm/ArmSvc.S      | GCC
>
>  [Sources.AARCH64]
> diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf 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]
>
>  [Sources.Arm]
>    Arm/ArmPlatformHelper.S    | GCC
> -  Arm/ArmPlatformHelper.asm  | RVCT
> +  Arm/ArmPlatformHelper.asm  | MSFT
>
>  [Sources.AArch64]
>    AArch64/ArmPlatformHelper.S
> 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
>
>  [Sources.ARM]
> -  Arm/ArmPlatformStackLib.asm     | RVCT
> +  Arm/ArmPlatformStackLib.asm     | MSFT
>    Arm/ArmPlatformStackLib.S       | GCC
>
>  [Sources.AARCH64]
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> index f2ac45d171bc..b663ff749182 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> @@ -21,11 +21,11 @@ [Sources.common]
>
>  [Sources.ARM]
>    Arm/ArchPrePeiCore.c
> -  Arm/PrePeiCoreEntryPoint.asm | RVCT
> +  Arm/PrePeiCoreEntryPoint.asm | MSFT
>    Arm/PrePeiCoreEntryPoint.S   | GCC
> -  Arm/SwitchStack.asm      | RVCT
> +  Arm/SwitchStack.asm      | MSFT
>    Arm/SwitchStack.S        | GCC
> -  Arm/Exception.asm        | RVCT
> +  Arm/Exception.asm        | MSFT
>    Arm/Exception.S          | GCC
>
>  [Sources.AARCH64]
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> index 84c319c3679b..6d05ed096c4c 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> @@ -21,11 +21,11 @@ [Sources.common]
>
>  [Sources.ARM]
>    Arm/ArchPrePeiCore.c
> -  Arm/PrePeiCoreEntryPoint.asm | RVCT
> +  Arm/PrePeiCoreEntryPoint.asm | MSFT
>    Arm/PrePeiCoreEntryPoint.S   | GCC
> -  Arm/SwitchStack.asm      | RVCT
> +  Arm/SwitchStack.asm      | MSFT
>    Arm/SwitchStack.S        | GCC
> -  Arm/Exception.asm        | RVCT
> +  Arm/Exception.asm        | MSFT
>    Arm/Exception.S          | GCC
>
>  [Sources.AARCH64]
> diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> index 9c5da0d42a7b..fd2a35e59591 100644
> --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
> +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> @@ -22,7 +22,7 @@ [Sources]
>  [Sources.ARM]
>    Arm/ArchPrePi.c
>    Arm/ModuleEntryPoint.S   | GCC
> -  Arm/ModuleEntryPoint.asm | RVCT
> +  Arm/ModuleEntryPoint.asm | MSFT
>
>  [Sources.AArch64]
>    AArch64/ArchPrePi.c
> diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> index ee9b05b25337..de3abadfeac6 100644
> --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
> +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> @@ -22,7 +22,7 @@ [Sources]
>  [Sources.ARM]
>    Arm/ArchPrePi.c
>    Arm/ModuleEntryPoint.S   | GCC
> -  Arm/ModuleEntryPoint.asm | RVCT
> +  Arm/ModuleEntryPoint.asm | MSFT
>
>  [Sources.AArch64]
>    AArch64/ArchPrePi.c
> diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf 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]
>    IoLibArmVirt.c
>    Arm/ArmVirtMmio.S       | GCC
> -  Arm/ArmVirtMmio.asm     | RVCT
> +  Arm/ArmVirtMmio.asm     | MSFT
>
>  [Sources.AARCH64]
>    IoLibArmVirt.c
> diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/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
>    Arm/CompareGuid.S   | GCC
>
> -  Arm/ScanMem.asm     |RVCT
> -  Arm/SetMem.asm      |RVCT
> -  Arm/CopyMem.asm     |RVCT
> -  Arm/CompareMem.asm  |RVCT
> -  Arm/CompareGuid.asm |RVCT
> +  Arm/ScanMem.asm     | MSFT
> +  Arm/SetMem.asm      | MSFT
> +  Arm/CopyMem.asm     | MSFT
> +  Arm/CompareMem.asm  | MSFT
> +  Arm/CompareGuid.asm | MSFT
>
>  [Sources.AARCH64]
>    AArch64/ScanMem.S
> diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf 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]
>
>  [Sources.ARM]
>    Synchronization.c
> -  Arm/Synchronization.asm       | RVCT
> +  Arm/Synchronization.asm       | MSFT
>    Arm/Synchronization.S         | GCC
>
>  [Sources.AARCH64]
> --
> 2.23.0
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47580): https://edk2.groups.io/g/devel/message/47580
Mute This Topic: https://groups.io/mt/34187300/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build

Posted by Leif Lindholm 6 years, 4 months ago

On Thu, Sep 19, 2019 at 12:38:00PM +0300, Ard Biesheuvel wrote:
> On Wed, 18 Sep 2019 at 15:27, Baptiste Gerondeau
> <baptiste.gerondeau@linaro.org> wrote:
> >
> > From: Baptiste GERONDEAU <bgerondeau@gmail.com>
> >
> > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"
> >
> > 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 <baptiste.gerondeau@linaro.org>
> 
> The changes look fine to me, but please split them out per package as
> Liming suggested.

Hmm, and I've just gone and contradicted that.
As I said in my reply to Liming, this is a very special situation, and
the net effect of splitting this patch up is that we end up with a
set of not-usefully-bisectable patches.

/
    Leif

> > ---
> >  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/ArmGicLib.inf
> > index 5e23c732bfab..4fccb938eb6d 100644
> > --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> > +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> > @@ -22,7 +22,7 @@ [Sources]
> >
> >  [Sources.ARM]
> >    GicV3/Arm/ArmGicV3.S     | GCC
> > -  GicV3/Arm/ArmGicV3.asm   | RVCT
> > +  GicV3/Arm/ArmGicV3.asm   | MSFT
> >
> >  [Sources.AARCH64]
> >    GicV3/AArch64/ArmGicV3.S
> > diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf b/ArmPkg/Library/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]
> >
> >  [Sources.Arm]
> >    Arm/ArmException.c
> > -  Arm/ExceptionSupport.asm | RVCT
> > +  Arm/ExceptionSupport.asm | MSFT
> >    Arm/ExceptionSupport.S   | GCC
> >
> >  [Sources.AARCH64]
> > diff --git a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf b/ArmPkg/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]
> >
> >  [Sources.Arm]
> >    Arm/ArmException.c
> > -  Arm/ExceptionSupport.asm | RVCT
> > +  Arm/ExceptionSupport.asm | MSFT
> >    Arm/ExceptionSupport.S   | GCC
> >
> >  [Sources.AARCH64]
> > diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/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                  = ArmHvcLib
> >
> >  [Sources.ARM]
> > -  Arm/ArmHvc.asm    | RVCT
> > +  Arm/ArmHvc.asm    | MSFT
> >    Arm/ArmHvc.S      | GCC
> >
> >  [Sources.AARCH64]
> > diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.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
> >    Arm/ArmV7ArchTimerSupport.S   | GCC
> >
> > -  Arm/ArmLibSupport.asm         | RVCT
> > -  Arm/ArmLibSupportV7.asm       | RVCT
> > -  Arm/ArmV7Support.asm          | RVCT
> > -  Arm/ArmV7ArchTimerSupport.asm | RVCT
> > +  Arm/ArmLibSupport.asm         | MSFT
> > +  Arm/ArmLibSupportV7.asm       | MSFT
> > +  Arm/ArmV7Support.asm          | MSFT
> > +  Arm/ArmV7ArchTimerSupport.asm | MSFT
> >
> >  [Sources.AARCH64]
> >    AArch64/AArch64Lib.h
> > diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/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]
> >    Arm/ArmMmuLibCore.c
> >    Arm/ArmMmuLibV7Support.S   | GCC
> > -  Arm/ArmMmuLibV7Support.asm |RVCT
> > +  Arm/ArmMmuLibV7Support.asm | MSFT
> >
> >  [Packages]
> >    ArmPkg/ArmPkg.dec
> > diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/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                  = ArmSmcLib
> >
> >  [Sources.ARM]
> > -  Arm/ArmSmc.asm    | RVCT
> > +  Arm/ArmSmc.asm    | MSFT
> >    Arm/ArmSmc.S      | GCC
> >
> >  [Sources.AARCH64]
> > diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> > index fa19bf649131..f4c9e5510b9a 100644
> > --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> > +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> > @@ -21,7 +21,7 @@ [Sources.AARCH64]
> >
> >  [Sources.ARM]
> >    Arm/Reset.S       | GCC
> > -  Arm/Reset.asm     | RVCT
> > +  Arm/Reset.asm     | MSFT
> >
> >  [Sources]
> >    ArmSmcPsciResetSystemLib.c
> > diff --git a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf b/ArmPkg/Library/ArmSvcLib/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                  = ArmSvcLib
> >
> >  [Sources.ARM]
> > -  Arm/ArmSvc.asm    | RVCT
> > +  Arm/ArmSvc.asm    | MSFT
> >    Arm/ArmSvc.S      | GCC
> >
> >  [Sources.AARCH64]
> > diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf 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]
> >
> >  [Sources.Arm]
> >    Arm/ArmPlatformHelper.S    | GCC
> > -  Arm/ArmPlatformHelper.asm  | RVCT
> > +  Arm/ArmPlatformHelper.asm  | MSFT
> >
> >  [Sources.AArch64]
> >    AArch64/ArmPlatformHelper.S
> > 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
> >
> >  [Sources.ARM]
> > -  Arm/ArmPlatformStackLib.asm     | RVCT
> > +  Arm/ArmPlatformStackLib.asm     | MSFT
> >    Arm/ArmPlatformStackLib.S       | GCC
> >
> >  [Sources.AARCH64]
> > diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> > index f2ac45d171bc..b663ff749182 100644
> > --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> > +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> > @@ -21,11 +21,11 @@ [Sources.common]
> >
> >  [Sources.ARM]
> >    Arm/ArchPrePeiCore.c
> > -  Arm/PrePeiCoreEntryPoint.asm | RVCT
> > +  Arm/PrePeiCoreEntryPoint.asm | MSFT
> >    Arm/PrePeiCoreEntryPoint.S   | GCC
> > -  Arm/SwitchStack.asm      | RVCT
> > +  Arm/SwitchStack.asm      | MSFT
> >    Arm/SwitchStack.S        | GCC
> > -  Arm/Exception.asm        | RVCT
> > +  Arm/Exception.asm        | MSFT
> >    Arm/Exception.S          | GCC
> >
> >  [Sources.AARCH64]
> > diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> > index 84c319c3679b..6d05ed096c4c 100644
> > --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> > +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> > @@ -21,11 +21,11 @@ [Sources.common]
> >
> >  [Sources.ARM]
> >    Arm/ArchPrePeiCore.c
> > -  Arm/PrePeiCoreEntryPoint.asm | RVCT
> > +  Arm/PrePeiCoreEntryPoint.asm | MSFT
> >    Arm/PrePeiCoreEntryPoint.S   | GCC
> > -  Arm/SwitchStack.asm      | RVCT
> > +  Arm/SwitchStack.asm      | MSFT
> >    Arm/SwitchStack.S        | GCC
> > -  Arm/Exception.asm        | RVCT
> > +  Arm/Exception.asm        | MSFT
> >    Arm/Exception.S          | GCC
> >
> >  [Sources.AARCH64]
> > diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> > index 9c5da0d42a7b..fd2a35e59591 100644
> > --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
> > +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> > @@ -22,7 +22,7 @@ [Sources]
> >  [Sources.ARM]
> >    Arm/ArchPrePi.c
> >    Arm/ModuleEntryPoint.S   | GCC
> > -  Arm/ModuleEntryPoint.asm | RVCT
> > +  Arm/ModuleEntryPoint.asm | MSFT
> >
> >  [Sources.AArch64]
> >    AArch64/ArchPrePi.c
> > diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> > index ee9b05b25337..de3abadfeac6 100644
> > --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
> > +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> > @@ -22,7 +22,7 @@ [Sources]
> >  [Sources.ARM]
> >    Arm/ArchPrePi.c
> >    Arm/ModuleEntryPoint.S   | GCC
> > -  Arm/ModuleEntryPoint.asm | RVCT
> > +  Arm/ModuleEntryPoint.asm | MSFT
> >
> >  [Sources.AArch64]
> >    AArch64/ArchPrePi.c
> > diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf 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]
> >    IoLibArmVirt.c
> >    Arm/ArmVirtMmio.S       | GCC
> > -  Arm/ArmVirtMmio.asm     | RVCT
> > +  Arm/ArmVirtMmio.asm     | MSFT
> >
> >  [Sources.AARCH64]
> >    IoLibArmVirt.c
> > diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/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
> >    Arm/CompareGuid.S   | GCC
> >
> > -  Arm/ScanMem.asm     |RVCT
> > -  Arm/SetMem.asm      |RVCT
> > -  Arm/CopyMem.asm     |RVCT
> > -  Arm/CompareMem.asm  |RVCT
> > -  Arm/CompareGuid.asm |RVCT
> > +  Arm/ScanMem.asm     | MSFT
> > +  Arm/SetMem.asm      | MSFT
> > +  Arm/CopyMem.asm     | MSFT
> > +  Arm/CompareMem.asm  | MSFT
> > +  Arm/CompareGuid.asm | MSFT
> >
> >  [Sources.AARCH64]
> >    AArch64/ScanMem.S
> > diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf 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]
> >
> >  [Sources.ARM]
> >    Synchronization.c
> > -  Arm/Synchronization.asm       | RVCT
> > +  Arm/Synchronization.asm       | MSFT
> >    Arm/Synchronization.S         | GCC
> >
> >  [Sources.AARCH64]
> > --
> > 2.23.0
> >

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47583): https://edk2.groups.io/g/devel/message/47583
Mute This Topic: https://groups.io/mt/34187300/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build

Posted by Ard Biesheuvel 6 years, 4 months ago

On Thu, 19 Sep 2019 at 12:52, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Thu, Sep 19, 2019 at 12:38:00PM +0300, Ard Biesheuvel wrote:
> > On Wed, 18 Sep 2019 at 15:27, Baptiste Gerondeau
> > <baptiste.gerondeau@linaro.org> wrote:
> > >
> > > From: Baptiste GERONDEAU <bgerondeau@gmail.com>
> > >
> > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"
> > >
> > > 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 <baptiste.gerondeau@linaro.org>
> >
> > The changes look fine to me, but please split them out per package as
> > Liming suggested.
>
> Hmm, and I've just gone and contradicted that.
> As I said in my reply to Liming, this is a very special situation, and
> the net effect of splitting this patch up is that we end up with a
> set of not-usefully-bisectable patches.
>

Fair enough. I won't get involved in that discussion, though.

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47584): https://edk2.groups.io/g/devel/message/47584
Mute This Topic: https://groups.io/mt/34187300/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH 1/3] ArmPkg/MdePkg : Unify INF files format
[edk2-devel] [PATCH 2/3] ARM/Assembler: Correct syntax from RVCT for MSFT
[edk2-devel] [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build