From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.7711.1640019355905107816 for ; Mon, 20 Dec 2021 08:55:56 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 02CCED6E; Mon, 20 Dec 2021 08:55:55 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4C50B3F774; Mon, 20 Dec 2021 08:55:54 -0800 (PST) From: "Ross Burton" 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 Message-Id: <20211220165547.845523-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/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 =0D OBJECTS =3D \=0D BrotliCompress.o \=0D + brotli/c/common/constants.o \=0D + brotli/c/common/context.o \=0D brotli/c/common/dictionary.o \=0D brotli/c/common/transform.o \=0D + brotli/c/common/platform.o \=0D + brotli/c/common/shared_dictionary.o \=0D brotli/c/dec/bit_reader.o \=0D brotli/c/dec/decode.o \=0D brotli/c/dec/huffman.o \=0D @@ -22,12 +26,15 @@ OBJECTS =3D \ brotli/c/enc/block_splitter.o \=0D brotli/c/enc/brotli_bit_stream.o \=0D brotli/c/enc/cluster.o \=0D + brotli/c/enc/compound_dictionary.o \=0D brotli/c/enc/compress_fragment.o \=0D brotli/c/enc/compress_fragment_two_pass.o \=0D + brotli/c/enc/command.o \=0D brotli/c/enc/dictionary_hash.o \=0D brotli/c/enc/encode.o \=0D brotli/c/enc/encoder_dict.o \=0D brotli/c/enc/entropy_encode.o \=0D + brotli/c/enc/fast_log.o \=0D brotli/c/enc/histogram.o \=0D brotli/c/enc/literal_cost.o \=0D brotli/c/enc/memory.o \=0D 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 =0D #LIBS =3D $(LIB_PATH)\Common.lib=0D =0D -COMMON_OBJ =3D brotli\c\common\dictionary.obj brotli\c\common\transform.ob= j=0D +COMMON_OBJ =3D \=0D + brotli\c\common\constants.obj \=0D + brotli\c\common\context.obj \=0D + brotli\c\common\dictionary.obj \=0D + brotli\c\common\transform.obj \=0D + brotli\c\common\platform.obj \=0D + brotli\c\common\shared_dictionary.obj=0D DEC_OBJ =3D \=0D brotli\c\dec\bit_reader.obj \=0D brotli\c\dec\decode.obj \=0D @@ -26,12 +32,15 @@ ENC_OBJ =3D \ brotli\c\enc\block_splitter.obj \=0D brotli\c\enc\brotli_bit_stream.obj \=0D brotli\c\enc\cluster.obj \=0D + brotli\c\enc\compound_dictionary.obj \=0D brotli\c\enc\compress_fragment.obj \=0D brotli\c\enc\compress_fragment_two_pass.obj \=0D + brotli\c\enc\command.obj \=0D brotli\c\enc\dictionary_hash.obj \=0D brotli\c\enc\encode.obj \=0D brotli\c\enc\encoder_dict.obj \=0D brotli\c\enc\entropy_encode.obj \=0D + brotli\c\enc\fast_log.obj \=0D brotli\c\enc\histogram.obj \=0D brotli\c\enc\literal_cost.obj \=0D brotli\c\enc\memory.obj \=0D 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