1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] MdeModulePkg: LzmaCustomDecompressLib.inf don't support EBC anymore

Zhiguang Liu posted 1 patch 4 years, 5 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf | 2 +-
MdeModulePkg/MdeModulePkg.dsc                                            | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[edk2-devel] [PATCH] MdeModulePkg: LzmaCustomDecompressLib.inf don't support EBC anymore
Posted by Zhiguang Liu 4 years, 5 months ago 
After unifying the definition of size_t, EBC compiler has failure.
So don't compile this inf file for EBC

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2338

Cc: Liming Gao <liming.gao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>

Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf | 2 +-
 MdeModulePkg/MdeModulePkg.dsc                                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
index 42b741c64b..e8061f54f9 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
@@ -25,7 +25,7 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32 X64 EBC
+#  VALID_ARCHITECTURES           = IA32 X64
 #
 
 [Sources]
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 4320839abf..f7dbb27ce2 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -299,7 +299,6 @@
   MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
   MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
   MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.inf
-  MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
   MdeModulePkg/Library/PeiDebugLibDebugPpi/PeiDebugLibDebugPpi.inf
   MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -433,6 +432,7 @@
 
 [Components.IA32, Components.X64, Components.ARM, Components.AARCH64]
   MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf
+  MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
   MdeModulePkg/Core/Dxe/DxeMain.inf {
     <LibraryClasses>
-- 
2.16.2.windows.1


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

View/Reply Online (#50931): https://edk2.groups.io/g/devel/message/50931
Mute This Topic: https://groups.io/mt/60761516/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg: LzmaCustomDecompressLib.inf don't support EBC anymore
Posted by Liming Gao 4 years, 5 months ago 
Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Liu, Zhiguang
>Sent: Wednesday, November 20, 2019 2:35 PM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Wang, Jian J
><jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>
>Subject: [PATCH] MdeModulePkg: LzmaCustomDecompressLib.inf don't
>support EBC anymore
>
>After unifying the definition of size_t, EBC compiler has failure.
>So don't compile this inf file for EBC
>
>REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2338
>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Jian J Wang <jian.j.wang@intel.com>
>Cc: Hao A Wu <hao.a.wu@intel.com>
>
>Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
>---
>
>MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompre
>ssLib.inf | 2 +-
> MdeModulePkg/MdeModulePkg.dsc                                            | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git
>a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompr
>essLib.inf
>b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecomp
>ressLib.inf
>index 42b741c64b..e8061f54f9 100644
>---
>a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompr
>essLib.inf
>+++
>b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecomp
>ressLib.inf
>@@ -25,7 +25,7 @@
> #
> # The following information is for reference only and not required by the
>build tools.
> #
>-#  VALID_ARCHITECTURES           = IA32 X64 EBC
>+#  VALID_ARCHITECTURES           = IA32 X64
> #
>
> [Sources]
>diff --git a/MdeModulePkg/MdeModulePkg.dsc
>b/MdeModulePkg/MdeModulePkg.dsc
>index 4320839abf..f7dbb27ce2 100644
>--- a/MdeModulePkg/MdeModulePkg.dsc
>+++ b/MdeModulePkg/MdeModulePkg.dsc
>@@ -299,7 +299,6 @@
>   MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
>
>MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLi
>bNull.inf
>
>MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerial
>PortPpi.inf
>-
>MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompre
>ssLib.inf
>
>MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLib
>ReportStatusCode.inf
>   MdeModulePkg/Library/PeiDebugLibDebugPpi/PeiDebugLibDebugPpi.inf
>   MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>@@ -433,6 +432,7 @@
>
> [Components.IA32, Components.X64, Components.ARM,
>Components.AARCH64]
>
>MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompre
>ssLib.inf
>+
>MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompre
>ssLib.inf
>   MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
>   MdeModulePkg/Core/Dxe/DxeMain.inf {
>     <LibraryClasses>
>--
>2.16.2.windows.1


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

View/Reply Online (#50932): https://edk2.groups.io/g/devel/message/50932
Mute This Topic: https://groups.io/mt/60761516/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg: LzmaCustomDecompressLib.inf don't support EBC anymore
Posted by Leif Lindholm 4 years, 5 months ago 
Hi Zhiguang,

A couple of comments.

On Wed, Nov 20, 2019 at 02:34:43PM +0800, Zhiguang Liu wrote:
> After unifying the definition of size_t, EBC compiler has failure.
> So don't compile this inf file for EBC
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2338
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> 
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf | 2 +-
>  MdeModulePkg/MdeModulePkg.dsc                                            | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> index 42b741c64b..e8061f54f9 100644
> --- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> @@ -25,7 +25,7 @@
>  #
>  # The following information is for reference only and not required by the build tools.
>  #
> -#  VALID_ARCHITECTURES           = IA32 X64 EBC
> +#  VALID_ARCHITECTURES           = IA32 X64

If updating this line, we may as well add the missing architectures:
AARCH64 and ARM.

>  #
>  
>  [Sources]
> diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
> index 4320839abf..f7dbb27ce2 100644
> --- a/MdeModulePkg/MdeModulePkg.dsc
> +++ b/MdeModulePkg/MdeModulePkg.dsc
> @@ -299,7 +299,6 @@
>    MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
>    MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
>    MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.inf
> -  MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>    MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
>    MdeModulePkg/Library/PeiDebugLibDebugPpi/PeiDebugLibDebugPpi.inf
>    MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
> @@ -433,6 +432,7 @@
>  
>  [Components.IA32, Components.X64, Components.ARM, Components.AARCH64]
>    MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf
> +  MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

I agree this solves the current problem, but then becomes something we
need to come back and fix for RISC-V (32 and 64) anyway.

Although I guess that applies to this whole section already...
And this antipattern repeats in NetworkPkg/Network.dsc.inc and
SecurityPkg/SecurityPkg.dsc.

I have raised https://bugzilla.tianocore.org/show_bug.cgi?id=2370 for
this latent issue. But I'm OK for this patch to go in as is (although
preferably with updated VALID_ARCHITECTURES) after stable tag.

Best Regards,

Leif

>    MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
>    MdeModulePkg/Core/Dxe/DxeMain.inf {
>      <LibraryClasses>
> -- 
> 2.16.2.windows.1
> 
> 
> 
> 

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

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

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.