summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Feng <bob.c.feng@intel.com>2022-01-26 16:30:14 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2022-02-15 02:13:32 +0000
commit42af706dfba72bf2639ae2101caca10d89701b24 (patch)
tree7753e08ade7a8b35cc8380d7df21e0b849404dd8
parentc9b7c6e0cc7da76b74bcdd8c90cef956d5ae971c (diff)
downloadedk2-42af706dfba72bf2639ae2101caca10d89701b24.tar.gz
edk2-42af706dfba72bf2639ae2101caca10d89701b24.tar.bz2
edk2-42af706dfba72bf2639ae2101caca10d89701b24.zip
BaseTools: Update brotli submodule
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3417 Update the brotli submodule to the latest commit (f4153a0) so that the build isn't broken in GCC 11 compilers. Signed-off-by: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Yuwei Chen <yuwei.chen@intel.com> Cc: Pedro Falcato <pedro.falcato@gmail.com> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
-rw-r--r--BaseTools/Source/C/BrotliCompress/GNUmakefile7
-rw-r--r--BaseTools/Source/C/BrotliCompress/Makefile11
m---------BaseTools/Source/C/BrotliCompress/brotli0
3 files changed, 17 insertions, 1 deletions
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
@@ -10,6 +10,13 @@ APPNAME = BrotliCompress
OBJECTS = \
BrotliCompress.o \
+ brotli/c/common/platform.o \
+ brotli/c/common/shared_dictionary.o \
+ brotli/c/common/constants.o \
+ brotli/c/common/context.o \
+ brotli/c/enc/command.o \
+ brotli/c/enc/compound_dictionary.o \
+ brotli/c/enc/fast_log.o \
brotli/c/common/dictionary.o \
brotli/c/common/transform.o \
brotli/c/dec/bit_reader.o \
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
@@ -13,14 +13,23 @@ 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\platform.obj \
+ brotli\c\common\shared_dictionary.obj \
+ brotli\c\common\transform.obj
DEC_OBJ = \
brotli\c\dec\bit_reader.obj \
brotli\c\dec\decode.obj \
brotli\c\dec\huffman.obj \
brotli\c\dec\state.obj
ENC_OBJ = \
+ brotli\c\enc\command.obj \
+ brotli\c\enc\compound_dictionary.obj \
brotli\c\enc\backward_references.obj \
+ brotli\c\enc\fast_log.obj \
brotli\c\enc\backward_references_hq.obj \
brotli\c\enc\bit_cost.obj \
brotli\c\enc\block_splitter.obj \
diff --git a/BaseTools/Source/C/BrotliCompress/brotli b/BaseTools/Source/C/BrotliCompress/brotli
-Subproject 666c3280cc11dc433c303d79a83d4ffbdd12cc8
+Subproject f4153a09f87cbb9c826d8fc12c74642bb2d879e