diff options
Diffstat (limited to 'recipes-extended/xen/files/tools-kdd-mute-spurious-gcc-warning-part2.patch')
-rw-r--r-- | recipes-extended/xen/files/tools-kdd-mute-spurious-gcc-warning-part2.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/recipes-extended/xen/files/tools-kdd-mute-spurious-gcc-warning-part2.patch b/recipes-extended/xen/files/tools-kdd-mute-spurious-gcc-warning-part2.patch deleted file mode 100644 index afd14231..00000000 --- a/recipes-extended/xen/files/tools-kdd-mute-spurious-gcc-warning-part2.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From 2de2b10b2252761baa5dd0077df384dbfcca8212 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= | ||
3 | <marmarek@invisiblethingslab.com> | ||
4 | Date: Tue, 22 May 2018 21:47:45 +0200 | ||
5 | Subject: [PATCH] tools/kdd: alternative way of muting spurious gcc warning | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Older gcc does not support #pragma GCC diagnostics, so use alternative | ||
11 | approach - change variable type to uint32_t (this code handle 32-bit | ||
12 | requests only anyway), which apparently also avoid gcc complaining about | ||
13 | this (otherwise correct) code. | ||
14 | |||
15 | Fixes 437e00fea04becc91c1b6bc1c0baa636b067a5cc "tools/kdd: mute spurious | ||
16 | gcc warning" | ||
17 | |||
18 | Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> | ||
19 | Acked-by: Wei Liu <wei.liu2@citrix.com> | ||
20 | Release-acked-by: Juergen Gross <jgross@suse.com> | ||
21 | Acked-by: Tim Deegan <tim@xen.org> | ||
22 | --- | ||
23 | tools/debugger/kdd/kdd.c | 5 +---- | ||
24 | 1 file changed, 1 insertion(+), 4 deletions(-) | ||
25 | |||
26 | diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c | ||
27 | index 61d769e..5a019a0 100644 | ||
28 | --- a/tools/debugger/kdd/kdd.c | ||
29 | +++ b/tools/debugger/kdd/kdd.c | ||
30 | @@ -687,7 +687,7 @@ static void kdd_handle_read_ctrl(kdd_state *s) | ||
31 | } | ||
32 | } else { | ||
33 | /* 32-bit control-register space starts at 0x[2]cc, for 84 bytes */ | ||
34 | - uint64_t offset = addr; | ||
35 | + uint32_t offset = addr; | ||
36 | if (offset > 0x200) | ||
37 | offset -= 0x200; | ||
38 | offset -= 0xcc; | ||
39 | @@ -695,10 +695,7 @@ static void kdd_handle_read_ctrl(kdd_state *s) | ||
40 | KDD_LOG(s, "Request outside of known control space\n"); | ||
41 | len = 0; | ||
42 | } else { | ||
43 | -#pragma GCC diagnostic push | ||
44 | -#pragma GCC diagnostic ignored "-Warray-bounds" | ||
45 | memcpy(buf, ((uint8_t *)&ctrl.c32) + offset, len); | ||
46 | -#pragma GCC diagnostic pop | ||
47 | } | ||
48 | } | ||
49 | |||
50 | -- | ||
51 | 2.7.4 | ||
52 | |||