From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755914AbcHDI7z (ORCPT ); Thu, 4 Aug 2016 04:59:55 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:41871 "EHLO imgpgp01.kl.imgtec.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752337AbcHDI7w (ORCPT ); Thu, 4 Aug 2016 04:59:52 -0400 X-PGP-Universal: processed; by imgpgp01.kl.imgtec.org on Thu, 04 Aug 2016 09:39:20 +0100 Date: Thu, 4 Aug 2016 09:39:20 +0100 From: James Hogan To: Steven Rostedt CC: , Linus Torvalds , Ingo Molnar , Andrew Morton , , Ross Burton , Laura Abbott Subject: Re: [PATCH 1/4] ftrace/recordmcount: Work around for addition of metag magic but not relocations Message-ID: <20160804083919.GD19514@jhogan-linux.le.imgtec.org> References: <20160803135416.011514852@goodmis.org> <20160803135453.373628713@goodmis.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4Epv4kl9IRBfg3rk" Content-Disposition: inline In-Reply-To: <20160803135453.373628713@goodmis.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-Originating-IP: [192.168.154.110] X-ESG-ENCRYPT-TAG: cee91754 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --4Epv4kl9IRBfg3rk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 03, 2016 at 09:54:17AM -0400, Steven Rostedt wrote: > From: Laura Abbott >=20 > glibc recently did a sync up (94e73c95d9b5 "elf.h: Sync with the gabi > webpage") that added a #define for EM_METAG but did not add relocations >=20 > This triggers build errors: >=20 > scripts/recordmcount.c: In function 'do_file': > scripts/recordmcount.c:466:28: error: 'R_METAG_ADDR32' undeclared (first = use in this function) > case EM_METAG: reltype =3D R_METAG_ADDR32; > ^~~~~~~~~~~~~~ > scripts/recordmcount.c:466:28: note: each undeclared identifier is report= ed only once for each function it appears in > scripts/recordmcount.c:468:20: error: 'R_METAG_NONE' undeclared (first us= e in this function) > rel_type_nop =3D R_METAG_NONE; > ^~~~~~~~~~~~ >=20 > Work around this change with some more #ifdefery for the relocations. >=20 > Fedora Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=3D1354034 >=20 > Link: http://lkml.kernel.org/r/1468005530-14757-1-git-send-email-labbott@= redhat.com >=20 > Cc: stable@vger.kernel.org # v3.9+ > Cc: James Hogan > Fixes: 00512bdd4573 ("metag: ftrace support") > Reported-by: Ross Burton > Signed-off-by: Laura Abbott > Signed-off-by: Steven Rostedt > --- > scripts/recordmcount.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) >=20 > diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c > index e167592793a7..42396a74405d 100644 > --- a/scripts/recordmcount.c > +++ b/scripts/recordmcount.c > @@ -33,10 +33,17 @@ > #include > #include > =20 > +/* > + * glibc synced up and added the metag number but didn't add the relocat= ions. > + * Work around this in a crude manner for now. > + */ > #ifndef EM_METAG > -/* Remove this when these make it to the standard system elf.h. */ > #define EM_METAG 174 > +#endif > +#ifndef R_METAG_ADDR32 > #define R_METAG_ADDR32 2 > +#endif > +#ifndef R_METAG_NONE > #define R_METAG_NONE 3 > #endif FWIW: Reviewed-by: James Hogan Thanks James --4Epv4kl9IRBfg3rk Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXov83AAoJEGwLaZPeOHZ6ea0P/1Q2r7A6CYpQENj69adjNtW7 IfubZpAv4OXP7Dp6UxDi8K7PKXsYaM9dEtvEyF+vxzYI0KKSPlrIfB0QQO8RKi+S apyCVnpu6I0da+usCVrTnhwDe0XsbZ52rfjpUl44zEDdVw2rJoTbCI9ZtPNLPQnG fm/poz882MSpDN0QJ8IdR9BcPrGHxS3OPhfwoz28a3o42vnGbisfrNz/C23YKSYR RT4NZ1LZA6eOsVpQD0uzj6advusKIlxYkwr2N6m0tPdWrpI59oyuLUh5GyRucvjN ocx56pcN1UHRDk7lRuBqCM1BnWpDhy96MJ6209i5xGUMvn5vvZHfgSYC/TeewLtP FBjqz4Dc+3gdSjjpBnn2o0/IjbW9wJDoGYmYBYFmUH3C5jmyDihmvo7rYl42pWAj JDN7+7Q9WXM+39GpyVgiveeNAftmSgcIrWNphLXPnWMnlCW1H9sNgg61UrZR7bDk WKwcwmIUAdmczhSUpWDJH1+L8Dob8yRf5fR0IY9fC+bCSlzzrHmxzn8GTOZioWqW 0UBx9FY4c2bZiCVbQuviZO5E32R0EeKuxS+wn4FncW0e+i3uBUwSpnD9PEolqK8J RPtAed28P/fPlGb5x6XYbPt9GQGrKrmxbuTJrASeMQxpnZO2z1OAcllFDm53IUMY SFAPuiMJAsRfrDrZkc/u =73Ln -----END PGP SIGNATURE----- --4Epv4kl9IRBfg3rk--