From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f50.google.com (mail-ua1-f50.google.com [209.85.222.50]) by mx.groups.io with SMTP id smtpd.web08.98.1644868006833739795 for ; Mon, 14 Feb 2022 11:46:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@google.com header.s=20210112 header.b=eLDwrEWz; spf=pass (domain: google.com, ip: 209.85.222.50, mailfrom: moritzf@google.com) Received: by mail-ua1-f50.google.com with SMTP id v5so8705099uam.3 for ; Mon, 14 Feb 2022 11:46:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=D+R4ucQzVmUSUN6BMKE8JuM4pLIO8Q6gOIq29RQJZMo=; b=eLDwrEWzri0pAz531+XjRcJZqEXkZRmM9Sv+xWQBIYpORr/E1hLG1Cl7aCAb6MTUMW PWvrd150htjhYoj7ONeEnYMYhqEqlEv14bxNI6RZtPCycgPe+M96YcjWFxRtQSamN1P2 0cLRq/+M48xbI4PXnL36/vzkvcgWvar1sSNWRqv1h+KWu6rfZld4nsxp34HFVGeKQ+2R Q75wy7ieqsi3H2UhEpuQu0Rq1kNSEhzcZ6WMUiS62WYy6voC8Cs3vxhZhKS0ugs2bgWO aKi/pB6dsruUU50HsSnZ7ht+Sq5AgEbPnd7MJZIQas8pSYJ+iQJpWp01taSebpHhnvJv AD9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=D+R4ucQzVmUSUN6BMKE8JuM4pLIO8Q6gOIq29RQJZMo=; b=dpA+u1TfJtEZ8/kefZCYPiJbbvZEJCpXOUhluD7lqo7qny42MYbtdaVCOvjGkLdOjT QGkOMlGj7afjiVTzNmJnZ3YX2EkgfnyyxC1AlQkJIwdM7w9rPBitoc+zUmG3qeTmk5li /He7SKfsHvC0J8fmpNQnSWDYE+3cWpsa/SkYgBosYMuoBSxFzRQQVcuu/FHcmWjP4knC kkxQPrRjsLC7ha4ZH7FQNtTUr79vP+Wkttg9VSzApYbjQe323Rh6BnGZmqQoADwOy8tp FWD6sGpAS77Rk2uy4l1wasGNpBNIGAymAKSo1XmdrQT6xTeVWn6UTBq18ZWMcu+gmmSh DWvQ== X-Gm-Message-State: AOAM531BXzERKdloUzzz2e0tNMNAEu5SH7GFfWuI/vaKLvDg9TPPrUtr f2y/KXr+nrxsUnmaEyDpLcKmuU5G3XVFaBdlHCq5X/euD+0= X-Google-Smtp-Source: ABdhPJxE/WhjxZBr05g9BsC2VPsNxk7zVVwvgkjsb9Y29kcq3Df/KeE716NkiRUy6W2Jkg5iNpwJGpFbDLOlE3OV034= X-Received: by 2002:ab0:7158:: with SMTP id k24mr161037uao.51.1644867601182; Mon, 14 Feb 2022 11:40:01 -0800 (PST) MIME-Version: 1.0 References: <31d3c848b46c5e9297ff25facaa0af9eb9f39d1e.1644838386.git.leonardo.garcia@linaro.org> In-Reply-To: <31d3c848b46c5e9297ff25facaa0af9eb9f39d1e.1644838386.git.leonardo.garcia@linaro.org> From: "Moritz Fischer" Date: Mon, 14 Feb 2022 11:39:50 -0800 Message-ID: Subject: Re: [edk2-devel] [PATCH] Updating brotli submodules to build with GCC 11. To: devel@edk2.groups.io, leonardo.garcia@linaro.org Cc: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, jian.j.wang@intel.com Content-Type: text/plain; charset="UTF-8" On Mon, Feb 14, 2022 at 10:24 AM Leonardo Garcia wrote: > > From: Leonardo Garcia > > GCC 11.1.0 introduced a new warning for variable length arrays as > parameters (vla-parameter). Brotli compression library had issues with > this which were fixed upstream by commits > 0a3944c8c99b8d10cc4325f721b7c273d2b41f7b and > 27dd7265403d8e8fed99a854b9c3e1db7d79525f in brotli repository. Updating > edk2 submodules to have these commits. While at it, adding two more > commits from the brotli repository to make it compatible with future > versions of python as well. > > The addition of new commits to the brotli tree made it necessary to add > more files to the build process of the brotli compression library in > BaseTools package. > > Signed-off-by: Leonardo Garcia Reviewed-by: Moritz Fischer > --- > BaseTools/Source/C/BrotliCompress/GNUmakefile | 9 ++++++++- > BaseTools/Source/C/BrotliCompress/brotli | 2 +- > MdeModulePkg/Library/BrotliCustomDecompressLib/brotli | 2 +- > 3 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile > index b150e5dd2b..0e73f8b2ce 100644 > --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile > +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile > @@ -12,6 +12,10 @@ OBJECTS = \ > BrotliCompress.o \ > brotli/c/common/dictionary.o \ > brotli/c/common/transform.o \ > + brotli/c/common/platform.o \ > + brotli/c/common/context.o \ > + brotli/c/common/constants.o \ > + brotli/c/common/shared_dictionary.o \ > brotli/c/dec/bit_reader.o \ > brotli/c/dec/decode.o \ > brotli/c/dec/huffman.o \ > @@ -33,7 +37,10 @@ OBJECTS = \ > brotli/c/enc/memory.o \ > brotli/c/enc/metablock.o \ > brotli/c/enc/static_dict.o \ > - brotli/c/enc/utf8_util.o > + brotli/c/enc/utf8_util.o \ > + brotli/c/enc/command.o \ > + brotli/c/enc/fast_log.o \ > + brotli/c/enc/compound_dictionary.o > > include $(MAKEROOT)/Makefiles/app.makefile > > 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 > diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > index 666c3280cc..f4153a09f8 160000 > --- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > +++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > @@ -1 +1 @@ > -Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d > +Subproject commit f4153a09f87cbb9c826d8fc12c74642bb2d879ea > -- > 2.34.1 > > > > ------------ > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#86656): https://edk2.groups.io/g/devel/message/86656 > Mute This Topic: https://groups.io/mt/89143163/6022470 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [moritzf@google.com] > ------------ > > Thanks for doing this, I was preparing a similar patch on my end. - Moritz