From: "Ross Burton" <ross@burtonini.com>
To: devel@edk2.groups.io
Cc: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com
Subject: [PATCH] BaseTools/Brotli: update to latest brotli submodule
Date: Mon, 20 Dec 2021 16:55:47 +0000 [thread overview]
Message-ID: <20211220165547.845523-1-ross.burton@arm.com> (raw)
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/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
next reply other threads:[~2021-12-20 16:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-20 16:55 Ross Burton [this message]
2021-12-20 17:01 ` [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule Pedro Falcato
2021-12-23 0:48 ` 回复: " gaoliming
2021-12-23 10:02 ` Ross Burton
2021-12-23 22:34 ` Michael D Kinney
2021-12-23 22:53 ` Ross Burton
2021-12-24 1:42 ` 回复: " gaoliming
2022-01-11 14:37 ` Bob Feng
2022-01-11 23:45 ` Pedro Falcato
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211220165547.845523-1-ross.burton@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox