From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757950AbcASVdf (ORCPT ); Tue, 19 Jan 2016 16:33:35 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:50564 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757876AbcASVdN (ORCPT ); Tue, 19 Jan 2016 16:33:13 -0500 Date: Tue, 19 Jan 2016 21:33:06 +0000 From: Ben Hutchings To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org Message-ID: <20160119213306.GE2637@decadent.org.uk> References: <20160119213213.GB2637@decadent.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="RE3pQJLXZi4fr8Xo" Content-Disposition: inline In-Reply-To: <20160119213213.GB2637@decadent.org.uk> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: ben@decadent.org.uk Subject: [PATCH perf 3/4] perf tools: Fix unused variables: x86_{32,64}_regoffset_table X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --RE3pQJLXZi4fr8Xo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable gcc 5 doesn't seem to care about these, but gcc 6 does and that results in a build failure. Fixes: bbbe6bf6037d ("perf tools: Introduce regs_query_register_offset() ..= =2E") Signed-off-by: Ben Hutchings --- tools/perf/arch/x86/util/dwarf-regs.c | 38 ++++++++++++++++---------------= ---- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/ut= il/dwarf-regs.c index 9223c16..fe1e516 100644 --- a/tools/perf/arch/x86/util/dwarf-regs.c +++ b/tools/perf/arch/x86/util/dwarf-regs.c @@ -55,26 +55,10 @@ struct pt_regs_offset { =20 #define REG_OFFSET_END {.name =3D NULL, .offset =3D 0} =20 +/* TODO: switching by dwarf address size */ #ifdef __x86_64__ -# define REG_OFFSET_NAME_64(n, r) {.name =3D n, .offset =3D offsetof(struc= t pt_regs, r)} -# define REG_OFFSET_NAME_32(n, r) {.name =3D n, .offset =3D -1} -#else -# define REG_OFFSET_NAME_64(n, r) {.name =3D n, .offset =3D -1} -# define REG_OFFSET_NAME_32(n, r) {.name =3D n, .offset =3D offsetof(struc= t pt_regs, r)} -#endif - -static const struct pt_regs_offset x86_32_regoffset_table[] =3D { - REG_OFFSET_NAME_32("%ax", eax), - REG_OFFSET_NAME_32("%cx", ecx), - REG_OFFSET_NAME_32("%dx", edx), - REG_OFFSET_NAME_32("%bx", ebx), - REG_OFFSET_NAME_32("$stack", esp), /* Stack address instead of %sp */ - REG_OFFSET_NAME_32("%bp", ebp), - REG_OFFSET_NAME_32("%si", esi), - REG_OFFSET_NAME_32("%di", edi), - REG_OFFSET_END, -}; =20 +#define REG_OFFSET_NAME_64(n, r) {.name =3D n, .offset =3D offsetof(struct= pt_regs, r)} static const struct pt_regs_offset x86_64_regoffset_table[] =3D { REG_OFFSET_NAME_64("%ax", rax), REG_OFFSET_NAME_64("%dx", rdx), @@ -94,12 +78,24 @@ static const struct pt_regs_offset x86_64_regoffset_tab= le[] =3D { REG_OFFSET_NAME_64("%r15", r15), REG_OFFSET_END, }; - -/* TODO: switching by dwarf address size */ -#ifdef __x86_64__ #define regoffset_table x86_64_regoffset_table + #else + +#define REG_OFFSET_NAME_32(n, r) {.name =3D n, .offset =3D offsetof(struct= pt_regs, r)} +static const struct pt_regs_offset x86_32_regoffset_table[] =3D { + REG_OFFSET_NAME_32("%ax", eax), + REG_OFFSET_NAME_32("%cx", ecx), + REG_OFFSET_NAME_32("%dx", edx), + REG_OFFSET_NAME_32("%bx", ebx), + REG_OFFSET_NAME_32("$stack", esp), /* Stack address instead of %sp */ + REG_OFFSET_NAME_32("%bp", ebp), + REG_OFFSET_NAME_32("%si", esi), + REG_OFFSET_NAME_32("%di", edi), + REG_OFFSET_END, +}; #define regoffset_table x86_32_regoffset_table + #endif =20 /* Minus 1 for the ending REG_OFFSET_END */ --RE3pQJLXZi4fr8Xo Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBVp6rkue/yOyVhhEJAQpVew//aFHl5kmtVt/O9d+GvRmWnPlaOH256Hz/ OLJVvOtJS/SW77nFGjfrNwnkSRopuKoGKdDWjbHN0StHgODO6F+UEL2ZTi1kRxng lQ+T/xFlqOwgMvT0vXQ9W9tAvWjWLxALaLS6/99GSLrXP3puXRqZ9i/EcbK3Ruzf icKVHynJsTXs5sGQ2A80qIOM9+voiOaE7OSfUTf0er0tYazN0XxhwHlkCOts7X29 j2xMV9zih2lWAaRmvuvyeoCvEdChox8uk8oBNIAhfJ/O5J1zNQhdV+iQs6Jw1BJJ DxrkWGrfKxabqIt9u1+PQQQtKt/CmW1lFKUOSKcC7ZsltY5Zs5+uOeL10/+p0A97 MqlrsKzRftM0X5iyt4nIlr+2eJ2V4ymvTjagxqf5mFQjkJ8vmGm06Xa2Ygp94ZSV 5nq7ihMfqHvo8FqoLMBBF5dxsdTqwp8xt5sAg98SgIxjunrG56/1BwYUtn03kTGO vPwvjb3BWwTueIP8nbNbChZMoYLkP7nFPvCXLOkB0VhsH1Cga06mDl159OJaDSk2 UjZAlhy/y+xcE3RTsTJSKJoxU9fxL4r2kj987pGiSvIq/du+mCqB6U8ONS+jbV// Y16uNS0/4ZEuW/55oKRoHKYM+ugqWqcvyNgF2NG/m8Tsdeug9lbcXNgl2D66YWnX 6vgE9Mr4cyc= =x1H9 -----END PGP SIGNATURE----- --RE3pQJLXZi4fr8Xo--