blob: 3995f022216b1d5f720c59904f71dc580f6a6a64 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From ae1045c42954772e48862162d0e95fbc9393c91e Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 17 Aug 2023 21:32:53 +0100
Subject: [PATCH 10/55] rombios: Work around GCC issue 99578
GCC 12 objects to pointers derived from a constant:
util.c: In function 'find_rsdp':
util.c:429:16: error: array subscript 0 is outside array bounds of 'uint16_t[0]' {aka 'short unsigned int[]'} [-Werror=array-bounds]
429 | ebda_seg = *(uint16_t *)ADDR_FROM_SEG_OFF(0x40, 0xe);
cc1: all warnings being treated as errors
This is a GCC bug, but work around it rather than turning array-bounds
checking off generally.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
(cherry picked from commit e35138a2ffbe1fe71edaaaaae71063dc545a8416)
---
tools/firmware/rombios/32bit/util.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/firmware/rombios/32bit/util.c b/tools/firmware/rombios/32bit/util.c
index 6c1c480514..a47e000a26 100644
--- a/tools/firmware/rombios/32bit/util.c
+++ b/tools/firmware/rombios/32bit/util.c
@@ -424,10 +424,10 @@ static struct acpi_20_rsdp *__find_rsdp(const void *start, unsigned int len)
struct acpi_20_rsdp *find_rsdp(void)
{
struct acpi_20_rsdp *rsdp;
- uint16_t ebda_seg;
+ uint16_t *volatile /* GCC issue 99578 */ ebda_seg =
+ ADDR_FROM_SEG_OFF(0x40, 0xe);
- ebda_seg = *(uint16_t *)ADDR_FROM_SEG_OFF(0x40, 0xe);
- rsdp = __find_rsdp((void *)(ebda_seg << 16), 1024);
+ rsdp = __find_rsdp((void *)(*ebda_seg << 16), 1024);
if (!rsdp)
rsdp = __find_rsdp((void *)0xE0000, 0x20000);
--
2.42.0
|
GitWeb
