From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f45.google.com (mail-ua1-f45.google.com [209.85.222.45]) by mx.groups.io with SMTP id smtpd.web11.86622.1638328059563484655 for ; Tue, 30 Nov 2021 19:07:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bG9S8QCi; spf=pass (domain: gmail.com, ip: 209.85.222.45, mailfrom: pedro.falcato@gmail.com) Received: by mail-ua1-f45.google.com with SMTP id o1so45940025uap.4 for ; Tue, 30 Nov 2021 19:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=jTuc/TZPeYX7PQ+1YY/BN+hgi86E9oBHe3IdK7cMQss=; b=bG9S8QCiQP6mEGHALtUlZZ7o88yoaZ6KnnPAFtpbzglHsLjKLTD9mp59t5WdVfsHjI i2HgkmZBi2OXMhvGywR73doe6EDTv38mD28CyhNvYDBL7NlePtTjAHZSnYj4E5GQWqFe hhq9dhrSqi/CwaV9uRZ9v9F88nm/0Y61lf0JoUiq8LPoYaWP0PNc+IHMNA8zuK9a4LX2 BHKwXXRpJlx+KyW59CW/0EBH59xvFP6SIYF+QB6eFC+L/pYj6uU+pT3M8suKQ/yH5wT0 mxsxxFqkPG128iyYNVLAqjSbgaY6E/C14eiFIM/cWlVGpmeGGNNFkIS9CT94AeSUcGl3 T7rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=jTuc/TZPeYX7PQ+1YY/BN+hgi86E9oBHe3IdK7cMQss=; b=KRQoYt0LSAIwDbYC7K08frh3fEIDswghaxmMvu8BTXFe2yjxtnAeUK67EmG5udBIXK 5U2k7iTg9QNgWyfAXtnAg4AcX12zdCHhmQT0+FqW5V/7e/0PgGWwqjo468jpbrPqWI8K GG77UNfTszAiIzPMF6QY4gbwdPececBr2PtBxQ+OACn3qSGwwEWvuj+OuBPcKxdZOMUD igsrGOWz5QIyMDjsHgWWLlzq72AfTpxx7jCkxeCaMR7NpIjealyaXwohZ1E7EyIwFrIR V6RbXVEXFWxa3zIq9kScjDmpn/KYvgIlLQPQPNDv5CLiAcknlOMDzDqzw5hrhLhoK2zk +erQ== X-Gm-Message-State: AOAM532CpoFfknI48hDSqBvqWJL0kZ8LbLnX5kpN/gZicJiiqOsT6Ptm M60ybxyMUT96BVMwznFVwBH4MKRZZ1BPM6Kf0wY1XDcjE0xo2w== X-Google-Smtp-Source: ABdhPJy04G/F52Oi6J9ip0OeTN2wqP78SrPqWTunefosAneVcoZHsRgO+ryRzG3VsFB7n/YBb3+K/P86TrDrt6jWoms= X-Received: by 2002:a67:846:: with SMTP id 67mr4441426vsi.7.1638328058565; Tue, 30 Nov 2021 19:07:38 -0800 (PST) MIME-Version: 1.0 References: <20211029022211.381-1-pedro.falcato@gmail.com> <000301d7e655$e9d07380$bd715a80$@byosoft.com.cn> In-Reply-To: <000301d7e655$e9d07380$bd715a80$@byosoft.com.cn> From: "Pedro Falcato" Date: Wed, 1 Dec 2021 03:07:25 +0000 Message-ID: Subject: =?UTF-8?B?UmU6IFtlZGsyLWRldmVsXSDlm57lpI06IFtQQVRDSCAxLzFdIEJhc2VUb29sczogVXBkYXRlIGJyb3RsaSB0byB0aGUgbGF0ZXN0IHVwc3RyZWFtIGNvbW1pdA==?= To: edk2-devel-groups-io , Liming Gao Cc: Bob Feng , Yuwei Chen Content-Type: multipart/alternative; boundary="000000000000f4d86e05d20cf92c" --000000000000f4d86e05d20cf92c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Liming, I've just tested this patch, and it is still broken from a usability POV, as while it fixes the original problem, it introduces new Werrors of the same kind. I must've tested this patch in Windows, which possibly doesn't trigger the error, but GCC still does. Therefore, I think we should wait for a fix (whether it is a consensus on the BZ that we should disable Werror in brotli or wait for an upstream fix of some kind) before touching the submodules. Thanks, Pedro On Wed, Dec 1, 2021 at 1:51 AM gaoliming wrote: > Pedro: > > I am OK to update brotli to new version. Please also update > MdeModulePkg\Library\BrotliCustomDecompressLib\brotli to make them be sam= e > version. > > > > Thanks > > Liming > > *=E5=8F=91=E4=BB=B6=E4=BA=BA:* Pedro Falcato > *=E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4:* 2021=E5=B9=B412=E6=9C=881=E6=97= =A5 8:39 > *=E6=94=B6=E4=BB=B6=E4=BA=BA:* edk2-devel-groups-io > *=E6=8A=84=E9=80=81:* Bob Feng ; Liming Gao < > gaoliming@byosoft.com.cn>; Yuwei Chen > *=E4=B8=BB=E9=A2=98:* Re: [PATCH 1/1] BaseTools: Update brotli to the lat= est upstream > commit > > > > Hi! > > > > It's been over a month and it would be great if you could take a look at > this, at least from a usability POV as more and more distros/operating > systems upgrade their compilers to GCC 11. > > > > Thanks, > > Pedro > > > > On Fri, Oct 29, 2021 at 3:22 AM Pedro Falcato > wrote: > > 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 > Cc: Liming Gao > Cc: Yuwei Chen > Signed-off-by: Pedro Falcato > --- > 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 =3D BrotliCompress > > OBJECTS =3D \ > 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 =3D \ > 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 =3D BrotliCompress > > #LIBS =3D $(LIB_PATH)\Common.lib > > -COMMON_OBJ =3D brotli\c\common\dictionary.obj brotli\c\common\transform.= obj > +COMMON_OBJ =3D \ > + 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 =3D \ > brotli\c\dec\bit_reader.obj \ > brotli\c\dec\decode.obj \ > @@ -26,12 +33,15 @@ ENC_OBJ =3D \ > 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..62662f87cdd9 160000 > --- a/BaseTools/Source/C/BrotliCompress/brotli > +++ b/BaseTools/Source/C/BrotliCompress/brotli > @@ -1 +1 @@ > -Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d > +Subproject commit 62662f87cdd96deda90ac817de94e3c4af75226a > -- > 2.33.1.windows.1 > > > > -- > > Pedro Falcato >=20 > > --=20 Pedro Falcato --000000000000f4d86e05d20cf92c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Liming,

I've just tested= this patch, and it is still broken from a usability POV, as while it fixes= the original problem, it introduces new Werrors of the same kind.
I must've tested this patch in Windows, which possibly doesn't tr= igger the error, but GCC still does.
Therefore, I think we sh= ould wait for a fix (whether it is a consensus on the BZ that we should dis= able Werror in brotli or wait for an upstream fix of some kind) before touc= hing the submodules.

Thanks,
Pedro

On Wed, Dec 1, 2021 at 1:51 AM gaoliming <gaoliming@byosoft.com.cn> wrote:

Pedro:

=C2=A0I am OK to update brotli to new version. Please = also update MdeModulePkg\Library\BrotliCustomDecompressLib\brotli to make t= hem be same version.

=C2=A0

Thanks

Liming

=E5=8F=91=E4=BB=B6=E4=BA=BA: Pedro Falcato <pedro.falcato@gmail.com>
=E5=8F= =91=E9=80=81=E6=97=B6=E9=97=B4: 20= 21=E5= =B9=B412=E6=9C=881= =E6=97=A5 8:39
=E6=94=B6=E4=BB=B6=E4=BA= =BA: edk2-devel-groups= -io <devel@edk= 2.groups.io>
=E6=8A=84=E9=80=81: Bob Feng <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosof= t.com.cn>; Yuwei Chen <yuwei.chen@intel.com>
=E4=B8=BB=E9=A2= =98: Re: [PATCH 1/1] B= aseTools: Update brotli to the latest upstream commit<= /span>

= =C2=A0

Hi!

=C2=A0

It's been over a month and it would be great if y= ou could take a look at this, at least from a usability POV as more and mor= e distros/operating systems upgrade their compilers to GCC 11.

= =C2=A0

Thanks,

Pedro

=C2=A0

On Fri, Oct 29, 2021 at 3:22 AM Pedro = Falcato <pe= dro.falcato@gmail.com> wrote:

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

This upd= ates BaseTools's brotli submodule to the latest upstream,
which fixe= s 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>
---
=C2=A0= BaseTools/Source/C/BrotliCompress/GNUmakefile |=C2=A0 7 +++++++
=C2=A0Ba= seTools/Source/C/BrotliCompress/Makefile=C2=A0 =C2=A0 | 12 +++++++++++-
= =C2=A0BaseTools/Source/C/BrotliCompress/brotli=C2=A0 =C2=A0 =C2=A0 |=C2=A0 = 2 +-
=C2=A03 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/Sourc= e/C/BrotliCompress/GNUmakefile
@@ -10,7 +10,11 @@ APPNAME =3D BrotliComp= ress

=C2=A0OBJECTS =3D \
=C2=A0 =C2=A0BrotliCompress.o \
+=C2= =A0 brotli/c/common/constants.o \
+=C2=A0 brotli/c/common/context.o \=C2=A0 =C2=A0brotli/c/common/dictionary.o \
+=C2=A0 brotli/c/common/pla= tform.o \
+=C2=A0 brotli/c/common/shared_dictionary.o \
=C2=A0 =C2=A0= brotli/c/common/transform.o \
=C2=A0 =C2=A0brotli/c/dec/bit_reader.o \=C2=A0 =C2=A0brotli/c/dec/decode.o \
@@ -22,12 +26,15 @@ OBJECTS =3D \=
=C2=A0 =C2=A0brotli/c/enc/block_splitter.o \
=C2=A0 =C2=A0brotli/c/e= nc/brotli_bit_stream.o \
=C2=A0 =C2=A0brotli/c/enc/cluster.o \
+=C2= =A0 brotli/c/enc/command.o \
+=C2=A0 brotli/c/enc/compound_dictionary.o = \
=C2=A0 =C2=A0brotli/c/enc/compress_fragment.o \
=C2=A0 =C2=A0brotli= /c/enc/compress_fragment_two_pass.o \
=C2=A0 =C2=A0brotli/c/enc/dictiona= ry_hash.o \
=C2=A0 =C2=A0brotli/c/enc/encode.o \
=C2=A0 =C2=A0brotli/= c/enc/encoder_dict.o \
=C2=A0 =C2=A0brotli/c/enc/entropy_encode.o \
+= =C2=A0 brotli/c/enc/fast_log.o \
=C2=A0 =C2=A0brotli/c/enc/histogram.o \=
=C2=A0 =C2=A0brotli/c/enc/literal_cost.o \
=C2=A0 =C2=A0brotli/c/enc= /memory.o \
diff --git a/BaseTools/Source/C/BrotliCompress/Makefile b/Ba= seTools/Source/C/BrotliCompress/Makefile
index 038d1ec24226..0ed39d4b5a2= c 100644
--- a/BaseTools/Source/C/BrotliCompress/Makefile
+++ b/BaseT= ools/Source/C/BrotliCompress/Makefile
@@ -13,7 +13,14 @@ APPNAME =3D Bro= tliCompress

=C2=A0#LIBS =3D $(LIB_PATH)\Common.lib

-COMMON_OB= J =3D brotli\c\common\dictionary.obj brotli\c\common\transform.obj
+COMM= ON_OBJ =3D \
+=C2=A0 brotli\c\common\constants.obj \
+=C2=A0 brotli\c= \common\context.obj \
+=C2=A0 brotli\c\common\dictionary.obj \
+=C2= =A0 brotli\c\common\platform.obj \
+=C2=A0 brotli\c\common\shared_dictio= nary.obj \
+=C2=A0 brotli\c\common\transform.obj
+
=C2=A0DEC_OBJ = =3D \
=C2=A0 =C2=A0brotli\c\dec\bit_reader.obj \
=C2=A0 =C2=A0brotli\= c\dec\decode.obj \
@@ -26,12 +33,15 @@ ENC_OBJ =3D \
=C2=A0 =C2=A0bro= tli\c\enc\block_splitter.obj \
=C2=A0 =C2=A0brotli\c\enc\brotli_bit_stre= am.obj \
=C2=A0 =C2=A0brotli\c\enc\cluster.obj \
+=C2=A0 brotli\c\enc= \command.obj \
+=C2=A0 brotli\c\enc\compound_dictionary.obj \
=C2=A0 = =C2=A0brotli\c\enc\compress_fragment.obj \
=C2=A0 =C2=A0brotli\c\enc\com= press_fragment_two_pass.obj \
=C2=A0 =C2=A0brotli\c\enc\dictionary_hash.= obj \
=C2=A0 =C2=A0brotli\c\enc\encode.obj \
=C2=A0 =C2=A0brotli\c\en= c\encoder_dict.obj \
=C2=A0 =C2=A0brotli\c\enc\entropy_encode.obj \
+= =C2=A0 brotli\c\enc\fast_log.obj \
=C2=A0 =C2=A0brotli\c\enc\histogram.o= bj \
=C2=A0 =C2=A0brotli\c\enc\literal_cost.obj \
=C2=A0 =C2=A0brotli= \c\enc\memory.obj \
diff --git a/BaseTools/Source/C/BrotliCompress/brotl= i b/BaseTools/Source/C/BrotliCompress/brotli
index 666c3280cc11..62662f8= 7cdd9 160000
--- a/BaseTools/Source/C/BrotliCompress/brotli
+++ b/Bas= eTools/Source/C/BrotliCompress/brotli
@@ -1 +1 @@
-Subproject commit = 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+Subproject commit 62662f87cdd9= 6deda90ac817de94e3c4af75226a
--
2.33.1.windows.1



--

Pedro Falcato

=20



--
Pedro Falcato
--000000000000f4d86e05d20cf92c--