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=CK3lHj0i; spf=pass (domain: linaro.org, ip: 209.85.128.68, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by groups.io with SMTP; Thu, 19 Sep 2019 02:52:08 -0700 Received: by mail-wm1-f68.google.com with SMTP id y135so6783014wmc.1 for ; Thu, 19 Sep 2019 02:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Yv1YXsEuKRbVmfZepPfXAaT5NL5Cm7zhs+yL7TEhlNk=; b=CK3lHj0iuTW9HT108GzJk1xC6u1PFxA6a8j/yPuirEJaLRijUQujVy9snkQQXvZ+c9 e9jgn2ZpaxGmdyUSSMVJ7GXJUETuwdl2CMn6/Cg8M8+7YL2QdjMp1vl2QxKVGTEReaJk 54QtnBZWhUWfBgVMz8c1DcyKrj33ItWKXRcgsHz5rd9PktktDsYC/PnzeXrG0dN3EUe5 66Sxicjsq8mbAziEAHJ6ocBPWKAWT+oXkfejqHx3hsWc+pgOWOvrHimVx5JhYno6mzH0 La3Z4he7ghZOgp3pr4JUTF1KzepmqYV5AazQ0xmY9yRvwvcFaQzo9F4JTrUGcJysbC89 C4yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=Yv1YXsEuKRbVmfZepPfXAaT5NL5Cm7zhs+yL7TEhlNk=; b=Yw0jUD+5xO6kj4v6Is43A4CbOGmBk0PrbMXCzyt+S3YdHcCPTDBB/XWME0KkzHXc0s lZl1O3B/ZI55VrPfkGPTlgu5x6wdeTdkOiJsVUL4NcMLg29t9F6yC7VbMm0S+ErfjwER KYn/HRtFyI8FAI+seA1199pQRF6jNej2/967mt8eiH461jTx0nIRegI/Ofb47lPb1qNU mIvWv80ZWW9+CrP5lmur5L3J6o2DOfKCEFvW8G/dIDcRHHMzS2zPGuFtvfTF7V6wfSvn FzEkdV6Rt+1dXtumJXnpUmoxBlAUDQrvX9XqYkkQIYG70RUyDDIcH9ZFSD/OpCAsrg1g IHmQ== X-Gm-Message-State: APjAAAW5HpV9syP+m6gsNNtcRb0ndULvQw6MpJb8Hc/Z7nix9OXc5KJU 7KPhtwvALUz17NigCdyrMW3T9Q== X-Google-Smtp-Source: APXvYqytmZEsKObfE3eASJQGIoeF2GjuppEq7IrYrPRyz/HL9Mcrz5s5mmyCwaQRRv3m8vvccAEkPQ== X-Received: by 2002:a05:600c:508:: with SMTP id i8mr1060608wmc.36.1568886726349; Thu, 19 Sep 2019 02:52:06 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id f8sm5322868wmb.37.2019.09.19.02.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 02:52:05 -0700 (PDT) Date: Thu, 19 Sep 2019 10:52:04 +0100 From: "Leif Lindholm" To: Ard Biesheuvel Cc: Baptiste Gerondeau , edk2-devel-groups-io , "Kinney, Michael D" , "Gao, Liming" , "Zhang, Shenglei" , Baptiste GERONDEAU Subject: Re: [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build Message-ID: <20190919095204.GP28454@bivouac.eciton.net> References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Sep 19, 2019 at 12:38:00PM +0300, Ard Biesheuvel wrote: > On Wed, 18 Sep 2019 at 15:27, Baptiste Gerondeau > wrote: > > > > From: Baptiste GERONDEAU > > > > 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 > > 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 > >