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.web11.27227.1640220500144131013 for ; Wed, 22 Dec 2021 16:48:21 -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, 23 Dec 2021 08:48:05 +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: <20211220165547.845523-1-ross.burton@arm.com> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIXSBCYXNlVG9vbHMvQnJvdGxpOiB1cGRhdGUgdG8gbGF0ZXN0IGJyb3RsaSBzdWJtb2R1bGU=?= Date: Thu, 23 Dec 2021 08:48:13 +0800 Message-ID: <001201d7f796$c45663b0$4d032b10$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQJtt0V7RqA86FE0wtwlyFRtOu/l9gF7fb4bqwfjAfA= Content-Type: multipart/alternative; boundary="----=_NextPart_000_0013_01D7F7D9.D27ADC30" Content-Language: zh-cn ------=_NextPart_000_0013_01D7F7D9.D27ADC30 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Create PR https://github.com/tianocore/edk2/pull/2346 for this patch.=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=8821=E6=97=A5 1:02 =E6=94=B6=E4=BB=B6=E4=BA=BA: edk2-devel-groups-io = ; ross@burtonini.com =E6=8A=84=E9=80=81: Bob Feng ; Liming Gao = ; Yuwei Chen =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to = latest brotli submodule =20 Ross, =20 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. =20 Best regards, Pedro =20 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 =3D BrotliCompress OBJECTS =3D \ 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 =3D \ 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 =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\transform.obj \ + brotli\c\common\platform.obj \ + brotli\c\common\shared_dictionary.obj DEC_OBJ =3D \ brotli\c\dec\bit_reader.obj \ brotli\c\dec\decode.obj \ @@ -26,12 +32,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\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 --=20 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 = =20 Unsubscribe: https://edk2.groups.io/g/devel/unsub = [pedro.falcato@gmail.com ] ------------ =20 --=20 Pedro Falcato ------=_NextPart_000_0013_01D7F7D9.D27ADC30 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Create PR https://github.com/t= ianocore/edk2/pull/2346 for this patch.

 

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=E6=9C=8821=E6=97=A5 = 1:02
=E6=94=B6=E4=BB=B6=E4=BA=BA: edk2-devel-groups-io = <devel@edk2.groups.io>; = ross@burtonini.com
=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: [edk2-devel] [PATCH] = BaseTools/Brotli: update to latest brotli = submodule

 

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 <ross@burtonini.com> = 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 <ross.burton@arm.com>
Change-Id: = I36d28cadb9bf2d9e01ac0341e69509fa1b8d6969
---
 BaseTools/Sourc= e/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 =3D BrotliCompress

 OBJECTS =3D \
  =  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 =3D \
   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 =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\transform.obj \
+  brotli\c\common\platform.obj = \
+  brotli\c\common\shared_dictionary.obj
 DEC_OBJ =3D = \
   brotli\c\dec\bit_reader.obj \
  =  brotli\c\dec\decode.obj \
@@ -26,12 +32,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\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
Mut= e 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

------=_NextPart_000_0013_01D7F7D9.D27ADC30--