From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web10.22774.1643245948554044653 for ; Wed, 26 Jan 2022 17:12:29 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Thu, 27 Jan 2022 09:12:23 +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: "'Bob Feng'" , Cc: "'Yuwei Chen'" , "'Pedro Falcato'" References: <20220126083014.480-1-bob.c.feng@intel.com> In-Reply-To: <20220126083014.480-1-bob.c.feng@intel.com> Subject: =?UTF-8?B?5Zue5aSNOiBbUGF0Y2ggMS8yXSBCYXNlVG9vbHM6IFVwZGF0ZSBicm90bGkgc3VibW9kdWxl?= Date: Thu, 27 Jan 2022 09:12:26 +0800 Message-ID: <000a01d8131a$f2b62390$d8226ab0$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQGhZuLKxOoc1PY8FttdINqrXa/GGazjaAlw Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Does this updated patch pass CI? Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: Bob Feng > =B7=A2=CB=CD=CA=B1=BC=E4: 2022=C4=EA1=D4=C226=C8=D5 16:30 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > =B3=AD=CB=CD: Liming Gao ; Yuwei Chen > ; Pedro Falcato > =D6=F7=CC=E2: [Patch 1/2] BaseTools: Update brotli submodule >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3D3417 > Update the brotli submodule to the latest commit (f4153a0) > so that the build isn't broken in GCC 11 compilers. >=20 > Signed-off-by: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > Cc: Pedro Falcato > --- > BaseTools/Source/C/BrotliCompress/GNUmakefile | 7 +++++++ > BaseTools/Source/C/BrotliCompress/Makefile | 11 ++++++++++- > BaseTools/Source/C/BrotliCompress/brotli | 2 +- > 3 files changed, 18 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile > b/BaseTools/Source/C/BrotliCompress/GNUmakefile > index b150e5dd2b..fd8e05c0e6 100644 > --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile > +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile > @@ -8,10 +8,17 @@ MAKEROOT ?=3D .. >=20 >=20 > APPNAME =3D BrotliCompress >=20 >=20 >=20 > OBJECTS =3D \ >=20 > BrotliCompress.o \ >=20 > + brotli/c/common/platform.o \ >=20 > + brotli/c/common/shared_dictionary.o \ >=20 > + brotli/c/common/constants.o \ >=20 > + brotli/c/common/context.o \ >=20 > + brotli/c/enc/command.o \ >=20 > + brotli/c/enc/compound_dictionary.o \ >=20 > + brotli/c/enc/fast_log.o \ >=20 > brotli/c/common/dictionary.o \ >=20 > brotli/c/common/transform.o \ >=20 > brotli/c/dec/bit_reader.o \ >=20 > brotli/c/dec/decode.o \ >=20 > brotli/c/dec/huffman.o \ >=20 > diff --git a/BaseTools/Source/C/BrotliCompress/Makefile > b/BaseTools/Source/C/BrotliCompress/Makefile > index 038d1ec242..36e69aa656 100644 > --- a/BaseTools/Source/C/BrotliCompress/Makefile > +++ b/BaseTools/Source/C/BrotliCompress/Makefile > @@ -11,18 +11,27 @@ CFLAGS =3D $(CFLAGS) /W2 >=20 >=20 > APPNAME =3D BrotliCompress >=20 >=20 >=20 > #LIBS =3D $(LIB_PATH)\Common.lib >=20 >=20 >=20 > -COMMON_OBJ =3D brotli\c\common\dictionary.obj > brotli\c\common\transform.obj >=20 > +COMMON_OBJ =3D \ >=20 > + brotli\c\common\constants.obj \ >=20 > + brotli\c\common\context.obj \ >=20 > + brotli\c\common\dictionary.obj \ >=20 > + brotli\c\common\platform.obj \ >=20 > + brotli\c\common\shared_dictionary.obj \ >=20 > + brotli\c\common\transform.obj >=20 > DEC_OBJ =3D \ >=20 > brotli\c\dec\bit_reader.obj \ >=20 > brotli\c\dec\decode.obj \ >=20 > brotli\c\dec\huffman.obj \ >=20 > brotli\c\dec\state.obj >=20 > ENC_OBJ =3D \ >=20 > + brotli\c\enc\command.obj \ >=20 > + brotli\c\enc\compound_dictionary.obj \ >=20 > brotli\c\enc\backward_references.obj \ >=20 > + brotli\c\enc\fast_log.obj \ >=20 > brotli\c\enc\backward_references_hq.obj \ >=20 > brotli\c\enc\bit_cost.obj \ >=20 > brotli\c\enc\block_splitter.obj \ >=20 > brotli\c\enc\brotli_bit_stream.obj \ >=20 > brotli\c\enc\cluster.obj \ >=20 > diff --git a/BaseTools/Source/C/BrotliCompress/brotli > b/BaseTools/Source/C/BrotliCompress/brotli > index 666c3280cc..f4153a09f8 160000 > --- a/BaseTools/Source/C/BrotliCompress/brotli > +++ b/BaseTools/Source/C/BrotliCompress/brotli > @@ -1 +1 @@ > -Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d > +Subproject commit f4153a09f87cbb9c826d8fc12c74642bb2d879ea > -- > 2.29.1.windows.1