From nobody Wed May 8 23:15:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+84284+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84284+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1638497420; cv=none; d=zohomail.com; s=zohoarc; b=MZcjxzTlWRiJK/dpIdd8Hv8UsoW+6I5rZQ0r6XY7JhnCBiRXUrjdhcXwhx8Goj3jozPshLAoiypxSWcfO1b5pmQw5Q7MzgdN/8GfB2wrsP+mewi5Mrhz7u9zPZShTvnTQb6fEqYb+gakpRt99vVFJ55o4WjOYvucbgUen91rz6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638497420; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=k9zAaSFPjZAFyUdoyVbCoeTs1Mm5IH6P7kfRk5xHhY0=; b=UfeM4pvnyFNNjchY4P+5mKvMFy8DxmlRiriwxYofVTaUt2ZLUHr/BwWR9wRxPH9W7v7oDeGdbM1a9FWqYKxGrGYVzZOaRw4ZfwT5oG7jDaqFa++ERZUYp3UcIJf5ERLKyvoMrp7pW3NgCzYZZ8P5BYj5d7j2iGIoNfDSytfFlcg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84284+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163849742058389.02614719481028; Thu, 2 Dec 2021 18:10:20 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id VaosYY1788612xDQOMAWasfE; Thu, 02 Dec 2021 18:10:20 -0800 X-Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web11.6517.1638497417475510222 for ; Thu, 02 Dec 2021 18:10:19 -0800 X-Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Fri, 03 Dec 2021 10:10:12 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Pedro Falcato'" , "'edk2-devel-groups-io'" Cc: "'Bob Feng'" , "'Yuwei Chen'" References: <20211029022211.381-1-pedro.falcato@gmail.com> <000301d7e655$e9d07380$bd715a80$@byosoft.com.cn> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0g5Zue5aSNOiBbUEFUQ0ggMS8xXSBCYXNlVG9vbHM6IFVwZGF0ZSBicm90bGkgdG8gdGhlIGxhdGVzdCB1cHN0cmVhbSBjb21taXQ=?= Date: Fri, 3 Dec 2021 10:10:15 +0800 Message-ID: <000701d7e7ea$e99d4280$bcd7c780$@byosoft.com.cn> MIME-Version: 1.0 Thread-Index: AQMATmUH/lu8OQwZy4lQASGPZZtIpwHVDboJAm3Gc0wBHxdBe6mkKTKw Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,gaoliming@byosoft.com.cn X-Gm-Message-State: fIAftrSGAoM7e9a51St7KsVux1787277AA= Content-Type: multipart/alternative; boundary="----=_NextPart_000_0008_01D7E82D.F7C1E210" Content-Language: zh-cn DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638497420; bh=wBa5Rc5nQEBnI0Xmte5XQVCv8ysu2iIxJaR275MmcTs=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=MSmwcVc+neppCX64ShvcR3zNjxupRSzwMfk2b9rSMIx8AyUThy7MKztiumRcCMlw3Mn mOVHnckqc6siX+k9PsvXEdcWc5Iw25JJiPgyMGxc6v8zoduCdeXXp0IkW09bQr4j6V7Vg X0bAgIxljmlAtDqxyTLX46qBugh/BJ8Hi+0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638497421134100001 ------=_NextPart_000_0008_01D7E82D.F7C1E210 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pedro: Now, we can disable werror in brotli first.=20 =20 Thanks Liming =E5=8F=91=E4=BB=B6=E4=BA=BA: Pedro Falcato =20 =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2021=E5=B9=B412=E6=9C=881=E6=97=A5 11= :07 =E6=94=B6=E4=BB=B6=E4=BA=BA: edk2-devel-groups-io ; L= iming Gao =E6=8A=84=E9=80=81: Bob Feng ; Yuwei Chen =E4=B8=BB=E9=A2=98: Re: [edk2-devel] =E5=9B=9E=E5=A4=8D: [PATCH 1/1] BaseTo= ols: Update brotli to the latest upstream commit =20 Liming, =20 I've just tested this patch, and it is still broken from a usability POV, a= s while it fixes the original problem, it introduces new Werrors of the sam= e 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 t= he BZ that we should disable Werror in brotli or wait for an upstream fix o= f some kind) before touching the submodules. =20 Thanks, Pedro =20 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\L= ibrary\BrotliCustomDecompressLib\brotli to make them be same version.=20 =20 Thanks Liming =E5=8F=91=E4=BB=B6=E4=BA=BA: Pedro Falcato >=20 =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 >; Yuwei Chen > =E4=B8=BB=E9=A2=98: Re: [PATCH 1/1] BaseTools: Update brotli to the latest = upstream commit =20 Hi! =20 It's been over a month and it would be great if you could take a look at th= is, at least from a usability POV as more and more distros/operating system= s upgrade their compilers to GCC 11. =20 Thanks, Pedro =20 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/Sour= ce/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 --=20 2.33.1.windows.1 --=20 Pedro Falcato --=20 Pedro Falcato -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#84284): https://edk2.groups.io/g/devel/message/84284 Mute This Topic: https://groups.io/mt/87468687/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- ------=_NextPart_000_0008_01D7E82D.F7C1E210 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Pedro:

=C2=A0= Now, we can disable werror in brotli first.

 

Thanks<= o:p>

Liming

=E5=8F=91=E4=BB=B6=E4=BA=BA: Pedro Falcato <pedro.falcato@gmail.com>
<= /span>= =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4:<= span lang=3DEN-US style=3D'font-size:11.0pt;font-family:=E7=AD=89=E7=BA=BF'= > 2021=E5=B9=B412=E6=9C=881= =E6=97=A5 11:07
=E6=94=B6=E4=BB=B6=E4=BA=BA= : edk2-devel-groups-io <= ;devel@edk2.groups.io>; Liming Gao <gaoliming@byosoft.com.cn>
<= /span>=E6=8A=84=E9=80=81: Bob Feng <bob.c.feng@intel.com>; Yuwei Chen <yuwei.chen@intel.c= om>
=E4=B8=BB=E9=A2=98: Re: [edk2-devel] =E5=9B=9E=E5=A4=8D= : [PATCH 1/1] BaseTools: Update brotli to the latest upstream commit

<= o:p> 

Liming,

 

I've just tested this patch, and it is still broken from a usa= bility POV, as while it fixes the original problem, it introduces new Werro= rs of the same kind.

<= span lang=3DEN-US>I must've tested this patch in Windows, which possibly do= esn'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 Werr= or in brotli or wait for an upstream fix of some kind) before touching the = submodules.

 

Thanks,

<= span lang=3DEN-US>Pedro

 

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

Pedro:

 I am OK to update brotli to new version. Please also= update MdeModulePkg\Library\BrotliCustomDecompressLib\brotli to make them = be same version.

<= span lang=3DEN-US style=3D'font-size:10.5pt;font-family:=E7=AD=89=E7=BA=BF'= > 

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: 2021=E5=B9=B412<= /span>=E6=9C=881=E6=97=A5 8:39=
=E6=94=B6=E4=BB=B6=E4=BA=BA: edk2-devel-groups-io <devel@edk2.groups.io>
=E6=8A= =84=E9=80=81: Bob Feng <= ;bob.c.feng@intel= .com>; Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>= ;
=E4=B8=BB=E9=A2=98: Re: [PATCH 1/1] BaseTools: Update brotli to the latest upstream c= ommit

 

Hi!

=  

It's been = over a month and it would be great if you could take a look at this, at lea= st 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 A= M Pedro Falcato <pedro.falcato@gmail.com> wrote:

BZ: https://bugzilla.tianocore.org/sho= w_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><= br>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/GNU= makefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile
index b150e5dd2= bb9..79d7c405069d 100644
--- a/BaseTools/Source/C/BrotliCompress/GNUmake= file
+++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile
@@ -10,7 +10= ,11 @@ APPNAME =3D BrotliCompress

 OBJECTS =3D \
  &nbs= p;BrotliCompress.o \
+  brotli/c/common/constants.o \
+  br= otli/c/common/context.o \
   brotli/c/common/dictionary.o \+  brotli/c/common/platform.o \
+  brotli/c/common/shared_dic= tionary.o \
   brotli/c/common/transform.o \
   b= rotli/c/dec/bit_reader.o \
   brotli/c/dec/decode.o \
@@ -2= 2,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 \
  &= nbsp;brotli/c/enc/dictionary_hash.o \
   brotli/c/enc/encode.o= \
   brotli/c/enc/encoder_dict.o \
   brotli/c/e= nc/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/Br= otliCompress/Makefile b/BaseTools/Source/C/BrotliCompress/Makefile
index= 038d1ec24226..0ed39d4b5a2c 100644
--- a/BaseTools/Source/C/BrotliCompre= ss/Makefile
+++ b/BaseTools/Source/C/BrotliCompress/Makefile
@@ -13,7= +13,14 @@ APPNAME =3D BrotliCompress

 #LIBS =3D $(LIB_PATH)\Co= mmon.lib

-COMMON_OBJ =3D brotli\c\common\dictionary.obj brotli\c\com= mon\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 \
+  brotl= i\c\common\shared_dictionary.obj \
+  brotli\c\common\transform.obj=
+
 DEC_OBJ =3D \
   brotli\c\dec\bit_reader.obj \<= br>   brotli\c\dec\decode.obj \
@@ -26,12 +33,15 @@ ENC_OBJ = =3D \
   brotli\c\enc\block_splitter.obj \
   bro= tli\c\enc\brotli_bit_stream.obj \
   brotli\c\enc\cluster.obj = \
+  brotli\c\enc\command.obj \
+  brotli\c\enc\compound_di= ctionary.obj \
   brotli\c\enc\compress_fragment.obj \
&nbs= p;  brotli\c\enc\compress_fragment_two_pass.obj \
   brot= li\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/Sour= ce/C/BrotliCompress/brotli b/BaseTools/Source/C/BrotliCompress/brotli
in= dex 666c3280cc11..62662f87cdd9 160000
--- a/BaseTools/Source/C/BrotliCom= press/brotli
+++ b/BaseTools/Source/C/BrotliCompress/brotli
@@ -1 +1 = @@
-Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+Subpr= oject commit 62662f87cdd96deda90ac817de94e3c4af75226a
--
2.33.1.wind= ows.1


--

Pedro Falcato



--

Pedro Falcato

_._,_._,_
G= roups.io Links:

You receive all messages sent to this group.

Vi= ew/Reply Online (#84284) | | Mute This Topic | New Topic
Your Subscription | Contact Group Owner | Unsubscribe [importer@patchew.org]
_._,_._,_=20 ------=_NextPart_000_0008_01D7E82D.F7C1E210--