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.f...@intel.com> Cc: Liming Gao <gaolim...@byosoft.com.cn> Cc: Yuwei Chen <yuwei.c...@intel.com> Cc: Pedro Falcato <pedro.falc...@gmail.com> --- 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..fd8e05c0e6 100644 --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile @@ -8,10 +8,17 @@ MAKEROOT ?= .. 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 \ brotli/c/dec/decode.o \ brotli/c/dec/huffman.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 @@ -11,18 +11,27 @@ CFLAGS = $(CFLAGS) /W2 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 \ brotli\c\enc\brotli_bit_stream.obj \ brotli\c\enc\cluster.obj \ 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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#86078): https://edk2.groups.io/g/devel/message/86078 Mute This Topic: https://groups.io/mt/88692491/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
