mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

sbsa-acs: Fix build on hosts with gcc11

Browse Source 
Backport a brotli patch which fixes a VLA warning seen with gcc 11

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Khem Raj
2021-06-02 11:19:53 -07:00
committed by Jon Mason
parent 6c857d39a6
commit 30143c26fb
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-Fix-VLA-parameter-warning.patch
+44
View File
@@ -0,0 +1,44 @@
From 498627ebda6271b59920f43a0b9b6187edeb7b09 Mon Sep 17 00:00:00 2001
From: Adrian Herrera <adr.her.arc.95@gmail.com>
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 <adr.her.arc.95@gmail.com>
---
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;
meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb
+3 -1
View File
@@ -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 \ git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \
file://shell.patch \ file://shell.patch \
file://0001-pal_uefi-Fix-enum-conversion.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_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803"
SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1" SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1"