From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f52.google.com (mail-ua1-f52.google.com [209.85.222.52]) by mx.groups.io with SMTP id smtpd.web11.7912.1640019710666293523 for ; Mon, 20 Dec 2021 09:01:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jirw0leE; spf=pass (domain: gmail.com, ip: 209.85.222.52, mailfrom: pedro.falcato@gmail.com) Received: by mail-ua1-f52.google.com with SMTP id a14so18974237uak.0 for ; Mon, 20 Dec 2021 09:01:50 -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=LTkbzvfPN/k+9JZyyC2KbJ1yo8O4xuSgOAC7v1ewLBk=; b=jirw0leEs6zIOVqvYM0tcihuMAbvxpfJ5A2JReDzKEUPiJqucYSXOMXpw3xFAXm8u1 93hb+GV7TrTJ3jzpcuuOEddiUBm1dYXpEYEIBtZriQTwGRIIK+Cc3xImMR4Gg0gKUi03 6CywofjMpKEllXS+NfpUjdI+aoCse2IZfvelD2U7XV7TNcjNA6D+lKmRTiIeM6LYkVhw I4eI1O0oUmnkd6gZDwCi8yC1WGnEBNizQhGVB25r/1QS/9cEKikJs/SeYWxeuJEJbdA9 xfBKcrp7+AWky+wPIr2KA6RIJH4ZlfbaIiwe8Jd8oZgQXd2rG27fMtz0ah84bCL0MClL TPvA== 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=LTkbzvfPN/k+9JZyyC2KbJ1yo8O4xuSgOAC7v1ewLBk=; b=Pg4CGD5rr38P9HrAhOEnbAF9G/XvwX1Tm1d8yhWDkVt/dXXNSnoVM0Wla58hEvF+b6 3OF2HeJGdBz/HD6rDVgEGaNL9cHLWg0wVeyoc27QsEt3gm7BEdaifx2A0ucKnvwiQ3qV kscr8//suDePinnS/HhkvAUQWyXtmLK8NGXfh30bgaofr6pnXitHIQv+J5pshUSBGpBO Xu1bSDNBGcANtyhR5OgpWrvDTs4bGLOklg57x90XYvcrP2WahOaAOfEnTfIbvWNLd0G9 Z9hI/ICgLPkscnHdLOhKiYiNTfUdKBoDC6lFwx4t2ZT+mrc1GC4g8UPuemvVST/LL0KE ED/g== X-Gm-Message-State: AOAM530Q3H9C8q5fzI/MQ7opeW9wSI8VqTsX3gM+RITGKIIHxmF2G8gs IXs+IdGisV2WPHPpsV1nGUDwmWuDHJSDf9kLXTiHpteLtwF/EQ== X-Google-Smtp-Source: ABdhPJyl8NXflFkaDLUw/GGpNN0nc0SuWpbkmqAJzf/1Tnr6774c4JWcAliw/2WiPqgOGjg2XEvTrAF3LEB2L4bTtzY= X-Received: by 2002:a05:6102:11e2:: with SMTP id e2mr2415625vsg.15.1640019709529; Mon, 20 Dec 2021 09:01:49 -0800 (PST) MIME-Version: 1.0 References: <20211220165547.845523-1-ross.burton@arm.com> In-Reply-To: <20211220165547.845523-1-ross.burton@arm.com> From: "Pedro Falcato" Date: Mon, 20 Dec 2021 17:01:37 +0000 Message-ID: Subject: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule To: edk2-devel-groups-io , ross@burtonini.com Cc: Bob Feng , Liming Gao , Yuwei Chen Content-Type: multipart/alternative; boundary="0000000000003612f805d396d819" --0000000000003612f805d396d819 Content-Type: text/plain; charset="UTF-8" Ross, This is a duplicate of https://edk2.groups.io/g/devel/message/84497, which has already been Rb'd and is just waiting for a maintainer to merge it. Best regards, Pedro On Mon, Dec 20, 2021 at 4:55 PM Ross Burton wrote: > Update to the latest Brotli commit, and extend the makefiles as needed. > > Specifically, this is needed for 0a3944 in brotli, to fix VLA parameter > warnings with new compilers. > > Signed-off-by: Ross Burton > Change-Id: I36d28cadb9bf2d9e01ac0341e69509fa1b8d6969 > --- > 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(-) > > diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile > b/BaseTools/Source/C/BrotliCompress/GNUmakefile > index b150e5dd2b..1a946140a3 100644 > --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile > +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile > @@ -10,8 +10,12 @@ APPNAME = BrotliCompress > > OBJECTS = \ > BrotliCompress.o \ > + brotli/c/common/constants.o \ > + brotli/c/common/context.o \ > brotli/c/common/dictionary.o \ > brotli/c/common/transform.o \ > + brotli/c/common/platform.o \ > + brotli/c/common/shared_dictionary.o \ > brotli/c/dec/bit_reader.o \ > brotli/c/dec/decode.o \ > brotli/c/dec/huffman.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/compound_dictionary.o \ > brotli/c/enc/compress_fragment.o \ > brotli/c/enc/compress_fragment_two_pass.o \ > + brotli/c/enc/command.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 038d1ec242..918497dc7b 100644 > --- a/BaseTools/Source/C/BrotliCompress/Makefile > +++ b/BaseTools/Source/C/BrotliCompress/Makefile > @@ -13,7 +13,13 @@ 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\transform.obj \ > + brotli\c\common\platform.obj \ > + brotli\c\common\shared_dictionary.obj > DEC_OBJ = \ > brotli\c\dec\bit_reader.obj \ > brotli\c\dec\decode.obj \ > @@ -26,12 +32,15 @@ ENC_OBJ = \ > brotli\c\enc\block_splitter.obj \ > brotli\c\enc\brotli_bit_stream.obj \ > brotli\c\enc\cluster.obj \ > + brotli\c\enc\compound_dictionary.obj \ > brotli\c\enc\compress_fragment.obj \ > brotli\c\enc\compress_fragment_two_pass.obj \ > + brotli\c\enc\command.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 666c3280cc..e83c7b8e8f 160000 > --- a/BaseTools/Source/C/BrotliCompress/brotli > +++ b/BaseTools/Source/C/BrotliCompress/brotli > @@ -1 +1 @@ > -Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d > +Subproject commit e83c7b8e8fb8b696a1df6866bc46cbb76d7e0348 > -- > 2.25.1 > > > > ------------ > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#85111): https://edk2.groups.io/g/devel/message/85111 > Mute This Topic: https://groups.io/mt/87860390/5946980 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [pedro.falcato@gmail.com > ] > ------------ > > > -- Pedro Falcato --0000000000003612f805d396d819 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Ross,

This is a duplicate of=C2=A0https://edk2.groups.io/= g/devel/message/84497, which has already been Rb'd and is just wait= ing for a maintainer to merge it.

Best regards,
Pedro

On Mon, Dec 20, 2021 at 4:55 PM Ross Burton <ross@burtonini.com> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-l= eft:1px solid rgb(204,204,204);padding-left:1ex">Update to the latest Brotl= i commit, and extend the makefiles as needed.

Specifically, this is needed for 0a3944 in brotli, to fix VLA parameter
warnings with new compilers.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Change-Id: I36d28cadb9bf2d9e01ac0341e69509fa1b8d6969
---
=C2=A0BaseTools/Source/C/BrotliCompress/GNUmakefile |=C2=A0 7 +++++++
=C2=A0BaseTools/Source/C/BrotliCompress/Makefile=C2=A0 =C2=A0 | 11 ++++++++= ++-
=C2=A0BaseTools/Source/C/BrotliCompress/brotli=C2=A0 =C2=A0 =C2=A0 |=C2=A0 = 2 +-
=C2=A03 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Sour= ce/C/BrotliCompress/GNUmakefile
index b150e5dd2b..1a946140a3 100644
--- a/BaseTools/Source/C/BrotliCompress/GNUmakefile
+++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile
@@ -10,8 +10,12 @@ APPNAME =3D BrotliCompress

=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 =C2=A0brotli/c/common/transform.o \
+=C2=A0 brotli/c/common/platform.o \
+=C2=A0 brotli/c/common/shared_dictionary.o \
=C2=A0 =C2=A0brotli/c/dec/bit_reader.o \
=C2=A0 =C2=A0brotli/c/dec/decode.o \
=C2=A0 =C2=A0brotli/c/dec/huffman.o \
@@ -22,12 +26,15 @@ OBJECTS =3D \
=C2=A0 =C2=A0brotli/c/enc/block_splitter.o \
=C2=A0 =C2=A0brotli/c/enc/brotli_bit_stream.o \
=C2=A0 =C2=A0brotli/c/enc/cluster.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 brotli/c/enc/command.o \
=C2=A0 =C2=A0brotli/c/enc/dictionary_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/BaseTools/Source/= C/BrotliCompress/Makefile
index 038d1ec242..918497dc7b 100644
--- a/BaseTools/Source/C/BrotliCompress/Makefile
+++ b/BaseTools/Source/C/BrotliCompress/Makefile
@@ -13,7 +13,13 @@ APPNAME =3D BrotliCompress

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

-COMMON_OBJ =3D brotli\c\common\dictionary.obj brotli\c\common\transform.ob= j
+COMMON_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\transform.obj \
+=C2=A0 brotli\c\common\platform.obj \
+=C2=A0 brotli\c\common\shared_dictionary.obj
=C2=A0DEC_OBJ =3D \
=C2=A0 =C2=A0brotli\c\dec\bit_reader.obj \
=C2=A0 =C2=A0brotli\c\dec\decode.obj \
@@ -26,12 +32,15 @@ ENC_OBJ =3D \
=C2=A0 =C2=A0brotli\c\enc\block_splitter.obj \
=C2=A0 =C2=A0brotli\c\enc\brotli_bit_stream.obj \
=C2=A0 =C2=A0brotli\c\enc\cluster.obj \
+=C2=A0 brotli\c\enc\compound_dictionary.obj \
=C2=A0 =C2=A0brotli\c\enc\compress_fragment.obj \
=C2=A0 =C2=A0brotli\c\enc\compress_fragment_two_pass.obj \
+=C2=A0 brotli\c\enc\command.obj \
=C2=A0 =C2=A0brotli\c\enc\dictionary_hash.obj \
=C2=A0 =C2=A0brotli\c\enc\encode.obj \
=C2=A0 =C2=A0brotli\c\enc\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.obj \
=C2=A0 =C2=A0brotli\c\enc\literal_cost.obj \
=C2=A0 =C2=A0brotli\c\enc\memory.obj \
diff --git a/BaseTools/Source/C/BrotliCompress/brotli b/BaseTools/Source/C/= BrotliCompress/brotli
index 666c3280cc..e83c7b8e8f 160000
--- a/BaseTools/Source/C/BrotliCompress/brotli
+++ b/BaseTools/Source/C/BrotliCompress/brotli
@@ -1 +1 @@
-Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+Subproject commit e83c7b8e8fb8b696a1df6866bc46cbb76d7e0348
--
2.25.1



------------
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85111): https://edk2.groups.io/g/dev= el/message/85111
Mute This Topic: https://groups.io/mt/87860390/5946980
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [pedro.falcato@gmail.c= om]
------------




--
Pedro Falcato
--0000000000003612f805d396d819--