From 30143c26fb6d15ad2ead6fdaf6ad263ca57de319 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 2 Jun 2021 11:19:53 -0700 Subject: [PATCH] sbsa-acs: Fix build on hosts with gcc11 Backport a brotli patch which fixes a VLA warning seen with gcc 11 Signed-off-by: Khem Raj Signed-off-by: Jon Mason --- .../0001-Fix-VLA-parameter-warning.patch | 44 +++++++++++++++++++ .../recipes-test/sbsa-acs/sbsa-acs_3.0.bb | 4 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-Fix-VLA-parameter-warning.patch diff --git a/meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-Fix-VLA-parameter-warning.patch b/meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-Fix-VLA-parameter-warning.patch new file mode 100644 index 00000000..66dede8f --- /dev/null +++ b/meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-Fix-VLA-parameter-warning.patch @@ -0,0 +1,44 @@ +From 498627ebda6271b59920f43a0b9b6187edeb7b09 Mon Sep 17 00:00:00 2001 +From: Adrian Herrera +Date: Mon, 22 Mar 2021 21:06:47 +0000 +Subject: [PATCH] Fix VLA parameter warning + +Make VLA buffer types consistent in declarations and definitions. +Resolves build crash when using -Werror due to "vla-parameter" warning. + +Upstream-Status: Submitted [https://github.com/google/brotli/pull/893] +Signed-off-by: Adrian Herrera +--- + c/dec/decode.c | 6 ++++-- + c/enc/encode.c | 5 +++-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +--- a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c ++++ b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c +@@ -2030,8 +2030,10 @@ static BROTLI_NOINLINE BrotliDecoderErro + } + + BrotliDecoderResult BrotliDecoderDecompress( +- size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size, +- uint8_t* decoded_buffer) { ++ size_t encoded_size, ++ const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)], ++ size_t* decoded_size, ++ uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) { + BrotliDecoderState s; + BrotliDecoderResult result; + size_t total_out = 0; +--- a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c ++++ b/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c +@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream( + + BROTLI_BOOL BrotliEncoderCompress( + int quality, int lgwin, BrotliEncoderMode mode, size_t input_size, +- const uint8_t* input_buffer, size_t* encoded_size, +- uint8_t* encoded_buffer) { ++ const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)], ++ size_t* encoded_size, ++ uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) { + BrotliEncoderState* s; + size_t out_size = *encoded_size; + const uint8_t* input_start = input_buffer; diff --git a/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb b/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb index 2116fc2f..173cfa7e 100644 --- a/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb +++ b/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb @@ -9,7 +9,9 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \ file://shell.patch \ file://0001-pal_uefi-Fix-enum-conversion.patch \ - file://use_bfd_linker.patch" + file://use_bfd_linker.patch \ + file://0001-Fix-VLA-parameter-warning.patch \ + " SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803" SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1"