From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753147AbcEMCOO (ORCPT ); Thu, 12 May 2016 22:14:14 -0400 Received: from mail.kernel.org ([198.145.29.136]:58040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751882AbcEMCON (ORCPT ); Thu, 12 May 2016 22:14:13 -0400 Date: Fri, 13 May 2016 11:14:02 +0900 From: Masami Hiramatsu To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , David Ahern , Jiri Olsa , Namhyung Kim , Wang Nan Subject: Re: [PATCH 05/10] perf dwarf: Guard !x86_64 definitions under #ifdef else clause Message-Id: <20160513111402.890ae6cc571ad388a54571f8@kernel.org> In-Reply-To: <1463083435-12828-6-git-send-email-acme@kernel.org> References: <1463083435-12828-1-git-send-email-acme@kernel.org> <1463083435-12828-6-git-send-email-acme@kernel.org> X-Mailer: Sylpheed 3.4.3 (GTK+ 2.24.28; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 12 May 2016 17:03:50 -0300 Arnaldo Carvalho de Melo wrote: > From: Arnaldo Carvalho de Melo > > To fix the build on Fedora Rawhide (gcc 6.0.0 20160311 (Red Hat 6.0.0-0.17): > > CC /tmp/build/perf/arch/x86/util/dwarf-regs.o > arch/x86/util/dwarf-regs.c:66:36: error: 'x86_32_regoffset_table' defined but not used [-Werror=unused-const-variable=] > static const struct pt_regs_offset x86_32_regoffset_table[] = { > ^~~~~~~~~~~~~~~~~~~~~~ > cc1: all warnings being treated as errors Looks good to me too. Acked-by: Masami Hiramatsu Thanks! > > Cc: Adrian Hunter > Cc: David Ahern > Cc: Jiri Olsa > Cc: Namhyung Kim > Cc: Wang Nan > Link: http://lkml.kernel.org/n/tip-fghuksc1u8ln82bof4lwcj0o@git.kernel.org > Signed-off-by: Arnaldo Carvalho de Melo > --- > tools/perf/arch/x86/util/dwarf-regs.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c > index 9223c164e545..1f86ee8fb831 100644 > --- a/tools/perf/arch/x86/util/dwarf-regs.c > +++ b/tools/perf/arch/x86/util/dwarf-regs.c > @@ -63,6 +63,8 @@ struct pt_regs_offset { > # define REG_OFFSET_NAME_32(n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} > #endif > > +/* TODO: switching by dwarf address size */ > +#ifndef __x86_64__ > static const struct pt_regs_offset x86_32_regoffset_table[] = { > REG_OFFSET_NAME_32("%ax", eax), > REG_OFFSET_NAME_32("%cx", ecx), > @@ -75,6 +77,8 @@ static const struct pt_regs_offset x86_32_regoffset_table[] = { > REG_OFFSET_END, > }; > > +#define regoffset_table x86_32_regoffset_table > +#else > static const struct pt_regs_offset x86_64_regoffset_table[] = { > REG_OFFSET_NAME_64("%ax", rax), > REG_OFFSET_NAME_64("%dx", rdx), > @@ -95,11 +99,7 @@ static const struct pt_regs_offset x86_64_regoffset_table[] = { > REG_OFFSET_END, > }; > > -/* TODO: switching by dwarf address size */ > -#ifdef __x86_64__ > #define regoffset_table x86_64_regoffset_table > -#else > -#define regoffset_table x86_32_regoffset_table > #endif > > /* Minus 1 for the ending REG_OFFSET_END */ > -- > 2.5.5 > -- Masami Hiramatsu