From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web10.10527.1638959224872876766 for ; Wed, 08 Dec 2021 02:27:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lL5CVJ2n; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: pedro.falcato@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id m25-20020a7bcb99000000b0033aa12cdd33so3105607wmi.1 for ; Wed, 08 Dec 2021 02:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3x/1AU8sPJUQiwaMMsbN6vGoeSnPh88bIjuvrk1bEQA=; b=lL5CVJ2nenTqaqcprITS2ILBViE7BQaGp6O7h7khfcaIGFxdoqLphM7CC6aSWAn/Jc 5gF0ONKI1A7/ikVm3moQC1uKiDuhtlSmNkImZ5NWNpzI8KjGcr6VRjETCZJdlL0H/vTU hluYqq6Kc1MKNWXlwSTpeNZ+j5eaByXXBp5D5X+DbPKza8eU2FFjONs9KIgqZbnpBMtw kQMY5SyMp7wSHv+qltKattxbj6s8WTWwrWesPnH3yGjKbryX4QJAW10KftgXTbTBUFVs 5VVAEKQYqIESCivQjxy1SWomepcPyO5brWbeBpn+Ue84vHeJZVVMh1WJkFuZKQsibnQP SBPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3x/1AU8sPJUQiwaMMsbN6vGoeSnPh88bIjuvrk1bEQA=; b=QqJz0OLlT+vBDWGJd9bUCVC7QF2XwHRmY0twAd2pDVVUZZZKXJ84l3xbd1J70wFwJ6 SBUT8hB2HHE5deYXBVN2TEOMyuqhisWPtQKuf53VBbjfmPfh3s2LC+mZ2tCQ+tc03tdO nEES8XMF9yGgbO9Eqel6UK9BsKCKF+NRewNk9veeqD+KfWPOH0V8OxTVXO3irkqx16RY moWs1Pc0215qkkCmgjILLGTXm00ERFi37wI41hyB17EQ/hGjJeELQT12ED8mLWUx1Q9u RWK6xPKoUu7nzXRBn7beCSBf4ALATt4wyP3T18ykdQCUDh42yCXeVciaARD4rVUMdnyI ubbw== X-Gm-Message-State: AOAM530a9NzVlF1uflgO/m2mfSKFhpS3LsusJf9hFD1hAJp72v/JO3I1 DizmktXeZTBF+k99+xnVXzBCo/+XdP5Ekw== X-Google-Smtp-Source: ABdhPJxKfEPhDV+38U1SmmwXNHyieR7Tv60zbm9I9hlE5yTNYIV9RAsAnj1S2zr6LZWyDNcXFSsnag== X-Received: by 2002:a05:600c:21cd:: with SMTP id x13mr15106197wmj.52.1638959223024; Wed, 08 Dec 2021 02:27:03 -0800 (PST) Return-Path: Received: from PC-PEDRO-ARCH.lan ([2001:8a0:7280:5801:9441:3dce:686c:bfc7]) by smtp.gmail.com with ESMTPSA id y7sm2252731wrw.55.2021.12.08.02.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Dec 2021 02:27:02 -0800 (PST) From: "Pedro Falcato" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen Subject: [PATCH v2 1/2] BaseTools: Update brotli to the latest upstream commit Date: Wed, 8 Dec 2021 10:27:00 +0000 Message-Id: <20211208102701.10815-2-pedro.falcato@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208102701.10815-1-pedro.falcato@gmail.com> References: <20211208102701.10815-1-pedro.falcato@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3417 This updates BaseTools's brotli submodule to the latest upstream, which fixes GCC 11's issue building BaseTools. Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Signed-off-by: Pedro Falcato --- BaseTools/Source/C/BrotliCompress/GNUmakefile | 7 +++++++ BaseTools/Source/C/BrotliCompress/Makefile | 12 +++++++++++- BaseTools/Source/C/BrotliCompress/brotli | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile index b150e5dd2bb9..79d7c405069d 100644 --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile @@ -10,7 +10,11 @@ APPNAME = BrotliCompress OBJECTS = \ BrotliCompress.o \ + brotli/c/common/constants.o \ + brotli/c/common/context.o \ brotli/c/common/dictionary.o \ + brotli/c/common/platform.o \ + brotli/c/common/shared_dictionary.o \ brotli/c/common/transform.o \ brotli/c/dec/bit_reader.o \ brotli/c/dec/decode.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/command.o \ + brotli/c/enc/compound_dictionary.o \ brotli/c/enc/compress_fragment.o \ brotli/c/enc/compress_fragment_two_pass.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 038d1ec24226..0ed39d4b5a2c 100644 --- a/BaseTools/Source/C/BrotliCompress/Makefile +++ b/BaseTools/Source/C/BrotliCompress/Makefile @@ -13,7 +13,14 @@ 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 \ @@ -26,12 +33,15 @@ ENC_OBJ = \ brotli\c\enc\block_splitter.obj \ brotli\c\enc\brotli_bit_stream.obj \ brotli\c\enc\cluster.obj \ + brotli\c\enc\command.obj \ + brotli\c\enc\compound_dictionary.obj \ brotli\c\enc\compress_fragment.obj \ brotli\c\enc\compress_fragment_two_pass.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 666c3280cc11..4ec67035c0d9 160000 --- a/BaseTools/Source/C/BrotliCompress/brotli +++ b/BaseTools/Source/C/BrotliCompress/brotli @@ -1 +1 @@ -Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d +Subproject commit 4ec67035c0d97c270c1c73038cc66fc5fcdfc120 -- 2.34.1