From 2de2b10b2252761baa5dd0077df384dbfcca8212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 22 May 2018 21:47:45 +0200 Subject: [PATCH] tools/kdd: alternative way of muting spurious gcc warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Older gcc does not support #pragma GCC diagnostics, so use alternative approach - change variable type to uint32_t (this code handle 32-bit requests only anyway), which apparently also avoid gcc complaining about this (otherwise correct) code. Fixes 437e00fea04becc91c1b6bc1c0baa636b067a5cc "tools/kdd: mute spurious gcc warning" Signed-off-by: Marek Marczykowski-Górecki Acked-by: Wei Liu Release-acked-by: Juergen Gross Acked-by: Tim Deegan --- tools/debugger/kdd/kdd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c index 61d769e..5a019a0 100644 --- a/tools/debugger/kdd/kdd.c +++ b/tools/debugger/kdd/kdd.c @@ -687,7 +687,7 @@ static void kdd_handle_read_ctrl(kdd_state *s) } } else { /* 32-bit control-register space starts at 0x[2]cc, for 84 bytes */ - uint64_t offset = addr; + uint32_t offset = addr; if (offset > 0x200) offset -= 0x200; offset -= 0xcc; @@ -695,10 +695,7 @@ static void kdd_handle_read_ctrl(kdd_state *s) KDD_LOG(s, "Request outside of known control space\n"); len = 0; } else { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Warray-bounds" memcpy(buf, ((uint8_t *)&ctrl.c32) + offset, len); -#pragma GCC diagnostic pop } } -- 2.7.4