From nobody Wed May 1 22:50:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+85111+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+85111+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1640019357; cv=none; d=zohomail.com; s=zohoarc; b=IPxtxOuJ3qclZLNaDwl44BeEtF6YZfGpvpw9K+gaPO0edol3RhRy/QMZbgkeR4ZcicFLLU6AkRekjcUtSbeHFL8Be5yeKPKQAMMUFXB2tNGd1+/S60Z3v6G2EbxVlqADG6IGntlXfcepmtMKIqsXuGi+NfPK99/TFSNztNVhG2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640019357; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=vCURLeK24hC4FMTt96g2mPA4hpkumf22sNBXMD1j0wk=; b=mPZx8Y+WI8CO/LwNsadu+Egt0YY4sUBNVD5XRmC94ri/bJyKpRYtNMEXSTFWS8jlnhluwl2XxDzgtJGOHgqOIgKBVTmJ0VLC/S0NetIoupa5baeq1ALHOrBMVqTccamNdHj7qt6XIzwsH1opAS5fWbtRsUtJIk6O3f/FSH4YqOU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+85111+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1640019357786877.3436030952297; Mon, 20 Dec 2021 08:55:57 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id tMX6YY1788612xWxDmHEiBXm; Mon, 20 Dec 2021 08:55:57 -0800 X-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 X-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) X-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: [edk2-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ross@burtonini.com X-Gm-Message-State: 1T7pwW7WksS0OgNEUBFYPc75x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1640019357; bh=bTTz9i5h27RZItOc1DVJLtQOSXyKiWgzy0e/c2c6oLM=; h=Cc:Date:From:Reply-To:Subject:To; b=O5hHtyyaXf+6xwkijZA/yfImC5nDDMFz2OnOj3AWj0++regfVV3A5E65yDOcRmk8FDg RRMd+fA7dLJxQkvuOF57JG6ZZiFAu7HxwuVqZzUQlHsSYS6ALewfv0lONRrmckR+WH8cF rU0H7q/aNgsFybctjZKFDhITPjLk5TEi1Ho= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1640019358722100001 Content-Type: text/plain; charset="utf-8" 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 =20 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 =20 #LIBS =3D $(LIB_PATH)\Common.lib =20 -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 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- 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/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-