[PATCH v2 0/2] Update brotli to the latest commit

[PATCH v2 0/2] Update brotli to the latest commit

[Pedro Falcato]

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3417

This patch set updates the brotli submodule to the latest commit, which
fixes a warning that triggers build failures for both BaseTools and
MdeModulePkg/BrotliCustomDecompressLib in GCC 11 compilers. 

Pedro Falcato (2):
  BaseTools: Update brotli to the latest upstream commit
  MdeModulePkg/BrotliCustomDecompressLib: Update brotli

 BaseTools/Source/C/BrotliCompress/GNUmakefile                                |  7 +++++++
 BaseTools/Source/C/BrotliCompress/Makefile                                   | 12 +++++++++++-
 BaseTools/Source/C/BrotliCompress/brotli                                     |  2 +-
 MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf |  3 +++
 MdeModulePkg/Library/BrotliCustomDecompressLib/brotli                        |  2 +-
 5 files changed, 23 insertions(+), 3 deletions(-)

-- 
2.34.1

[PATCH v2 1/2] BaseTools: Update brotli to the latest upstream commit

[Pedro Falcato]

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3417

This updates BaseTools's brotli submodule to the latest upstream,
which fixes GCC 11's issue building BaseTools.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
---
 BaseTools/Source/C/BrotliCompress/GNUmakefile |  7 +++++++
 BaseTools/Source/C/BrotliCompress/Makefile    | 12 +++++++++++-
 BaseTools/Source/C/BrotliCompress/brotli      |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile
index b150e5dd2bb9..79d7c405069d 100644
--- a/BaseTools/Source/C/BrotliCompress/GNUmakefile
+++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile
@@ -10,7 +10,11 @@ APPNAME = BrotliCompress
 
 OBJECTS = \
   BrotliCompress.o \
+  brotli/c/common/constants.o \
+  brotli/c/common/context.o \
   brotli/c/common/dictionary.o \
+  brotli/c/common/platform.o \
+  brotli/c/common/shared_dictionary.o \
   brotli/c/common/transform.o \
   brotli/c/dec/bit_reader.o \
   brotli/c/dec/decode.o \
@@ -22,12 +26,15 @@ OBJECTS = \
   brotli/c/enc/block_splitter.o \
   brotli/c/enc/brotli_bit_stream.o \
   brotli/c/enc/cluster.o \
+  brotli/c/enc/command.o \
+  brotli/c/enc/compound_dictionary.o \
   brotli/c/enc/compress_fragment.o \
   brotli/c/enc/compress_fragment_two_pass.o \
   brotli/c/enc/dictionary_hash.o \
   brotli/c/enc/encode.o \
   brotli/c/enc/encoder_dict.o \
   brotli/c/enc/entropy_encode.o \
+  brotli/c/enc/fast_log.o \
   brotli/c/enc/histogram.o \
   brotli/c/enc/literal_cost.o \
   brotli/c/enc/memory.o \
diff --git a/BaseTools/Source/C/BrotliCompress/Makefile b/BaseTools/Source/C/BrotliCompress/Makefile
index 038d1ec24226..0ed39d4b5a2c 100644
--- a/BaseTools/Source/C/BrotliCompress/Makefile
+++ b/BaseTools/Source/C/BrotliCompress/Makefile
@@ -13,7 +13,14 @@ APPNAME = BrotliCompress
 
 #LIBS = $(LIB_PATH)\Common.lib
 
-COMMON_OBJ = brotli\c\common\dictionary.obj brotli\c\common\transform.obj
+COMMON_OBJ = \
+  brotli\c\common\constants.obj \
+  brotli\c\common\context.obj \
+  brotli\c\common\dictionary.obj \
+  brotli\c\common\platform.obj \
+  brotli\c\common\shared_dictionary.obj \
+  brotli\c\common\transform.obj
+
 DEC_OBJ = \
   brotli\c\dec\bit_reader.obj \
   brotli\c\dec\decode.obj \
@@ -26,12 +33,15 @@ ENC_OBJ = \
   brotli\c\enc\block_splitter.obj \
   brotli\c\enc\brotli_bit_stream.obj \
   brotli\c\enc\cluster.obj \
+  brotli\c\enc\command.obj \
+  brotli\c\enc\compound_dictionary.obj \
   brotli\c\enc\compress_fragment.obj \
   brotli\c\enc\compress_fragment_two_pass.obj \
   brotli\c\enc\dictionary_hash.obj \
   brotli\c\enc\encode.obj \
   brotli\c\enc\encoder_dict.obj \
   brotli\c\enc\entropy_encode.obj \
+  brotli\c\enc\fast_log.obj \
   brotli\c\enc\histogram.obj \
   brotli\c\enc\literal_cost.obj \
   brotli\c\enc\memory.obj \
diff --git a/BaseTools/Source/C/BrotliCompress/brotli b/BaseTools/Source/C/BrotliCompress/brotli
index 666c3280cc11..4ec67035c0d9 160000
--- a/BaseTools/Source/C/BrotliCompress/brotli
+++ b/BaseTools/Source/C/BrotliCompress/brotli
@@ -1 +1 @@
-Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+Subproject commit 4ec67035c0d97c270c1c73038cc66fc5fcdfc120
-- 
2.34.1

[PATCH v2 2/2] MdeModulePkg/BrotliCustomDecompressLib: Update brotli

[Pedro Falcato]

Update the brotli submodule to the latest commit (4ec6703)
so that the build isn't broken in GCC 11 compilers.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
---
 MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf | 3 +++
 MdeModulePkg/Library/BrotliCustomDecompressLib/brotli                        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf b/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf
index 525e92408d67..fabbb86d16c1 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf
@@ -39,7 +39,10 @@
   stdlib.h
   string.h
   # Wrapper header files end #
+  brotli/c/common/constants.c
+  brotli/c/common/context.c
   brotli/c/common/dictionary.c
+  brotli/c/common/shared_dictionary.c
   brotli/c/common/transform.c
   brotli/c/dec/bit_reader.c
   brotli/c/dec/decode.c
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
index 666c3280cc11..4ec67035c0d9 160000
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
@@ -1 +1 @@
-Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+Subproject commit 4ec67035c0d97c270c1c73038cc66fc5fcdfc120
-- 
2.34.1

回复: [edk2-devel] [PATCH v2 0/2] Update brotli to the latest commit

[gaoliming]

Pedro:
  Does Brotli fix GCC warning in the latest version? 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Pedro Falcato
> 发送时间: 2021年12月8日 18:27
> 收件人: devel@edk2.groups.io
> 主题: [edk2-devel] [PATCH v2 0/2] Update brotli to the latest commit
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3417
> 
> This patch set updates the brotli submodule to the latest commit, which
> fixes a warning that triggers build failures for both BaseTools and
> MdeModulePkg/BrotliCustomDecompressLib in GCC 11 compilers.
> 
> Pedro Falcato (2):
>   BaseTools: Update brotli to the latest upstream commit
>   MdeModulePkg/BrotliCustomDecompressLib: Update brotli
> 
>  BaseTools/Source/C/BrotliCompress/GNUmakefile
> |  7 +++++++
>  BaseTools/Source/C/BrotliCompress/Makefile
> | 12 +++++++++++-
>  BaseTools/Source/C/BrotliCompress/brotli
> |  2 +-
> 
> MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompre
> ssLib.inf |  3 +++
>  MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
> |  2 +-
>  5 files changed, 23 insertions(+), 3 deletions(-)
> 
> --
> 2.34.1
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH v2 0/2] Update brotli to the latest commit

[Pedro Falcato]

[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]

Liming,

Yes, yes it does. No need to turn off Werror now.

Thanks,
Pedro

On Wed, 15 Dec 2021, 05:36 gaoliming, <gaoliming@byosoft.com.cn> wrote:

> Pedro:
>   Does Brotli fix GCC warning in the latest version?
>
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Pedro Falcato
> > 发送时间: 2021年12月8日 18:27
> > 收件人: devel@edk2.groups.io
> > 主题: [edk2-devel] [PATCH v2 0/2] Update brotli to the latest commit
> >
> > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3417
> >
> > This patch set updates the brotli submodule to the latest commit, which
> > fixes a warning that triggers build failures for both BaseTools and
> > MdeModulePkg/BrotliCustomDecompressLib in GCC 11 compilers.
> >
> > Pedro Falcato (2):
> >   BaseTools: Update brotli to the latest upstream commit
> >   MdeModulePkg/BrotliCustomDecompressLib: Update brotli
> >
> >  BaseTools/Source/C/BrotliCompress/GNUmakefile
> > |  7 +++++++
> >  BaseTools/Source/C/BrotliCompress/Makefile
> > | 12 +++++++++++-
> >  BaseTools/Source/C/BrotliCompress/brotli
> > |  2 +-
> >
> > MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompre
> > ssLib.inf |  3 +++
> >  MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
> > |  2 +-
> >  5 files changed, 23 insertions(+), 3 deletions(-)
> >
> > --
> > 2.34.1
> >
> >
> >
> >
> >
>
>
>
>
>
> 
>
>
>

[-- Attachment #2: Type: text/html, Size: 2418 bytes --]

回复: [edk2-devel] [PATCH v2 0/2] Update brotli to the latest commit

[gaoliming]

[-- Attachment #1: Type: text/plain, Size: 1906 bytes --]

That’s great. Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

 

发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Pedro Falcato
发送时间: 2021年12月15日 18:18
收件人: edk2-devel-groups-io <devel@edk2.groups.io>; Liming Gao <gaoliming@byosoft.com.cn>
主题: Re: [edk2-devel] [PATCH v2 0/2] Update brotli to the latest commit

 

Liming,

 

Yes, yes it does. No need to turn off Werror now.

 

Thanks, 

Pedro

 

On Wed, 15 Dec 2021, 05:36 gaoliming, <gaoliming@byosoft.com.cn <mailto:gaoliming@byosoft.com.cn> > wrote:

Pedro:
  Does Brotli fix GCC warning in the latest version? 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <mailto:devel@edk2.groups.io>  <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > 代表 Pedro Falcato
> 发送时间: 2021年12月8日 18:27
> 收件人: devel@edk2.groups.io <mailto:devel@edk2.groups.io> 
> 主题: [edk2-devel] [PATCH v2 0/2] Update brotli to the latest commit
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3417
> 
> This patch set updates the brotli submodule to the latest commit, which
> fixes a warning that triggers build failures for both BaseTools and
> MdeModulePkg/BrotliCustomDecompressLib in GCC 11 compilers.
> 
> Pedro Falcato (2):
>   BaseTools: Update brotli to the latest upstream commit
>   MdeModulePkg/BrotliCustomDecompressLib: Update brotli
> 
>  BaseTools/Source/C/BrotliCompress/GNUmakefile
> |  7 +++++++
>  BaseTools/Source/C/BrotliCompress/Makefile
> | 12 +++++++++++-
>  BaseTools/Source/C/BrotliCompress/brotli
> |  2 +-
> 
> MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompre
> ssLib.inf |  3 +++
>  MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
> |  2 +-
>  5 files changed, 23 insertions(+), 3 deletions(-)
> 
> --
> 2.34.1
> 
> 
> 
> 
> 












[-- Attachment #2: Type: text/html, Size: 6401 bytes --]