From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161150AbcGZVWc (ORCPT ); Tue, 26 Jul 2016 17:22:32 -0400 Received: from smtprelay0242.hostedemail.com ([216.40.44.242]:55811 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932318AbcGZVWa (ORCPT ); Tue, 26 Jul 2016 17:22:30 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 50,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::,RULES_HIT:41:355:379:541:599:800:960:967:968:973:982:988:989:1260:1263:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:1801:2393:2525:2553:2560:2563:2682:2685:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3352:3622:3865:3866:3867:3868:3870:3872:3873:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4362:4605:5007:6261:7875:7903:9025:9040:9121:9391:10004:10400:10848:10913:10967:11232:11658:11914:12043:12296:12517:12519:12555:12740:12783:13069:13311:13357:13439:13846:14096:14097:14181:14581:14659:14721:14777:21080:21433:21434:30054:30064:30070:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none X-HE-Tag: range86_14ed32ab85850 X-Filterd-Recvd-Size: 2278 Date: Tue, 26 Jul 2016 17:22:22 -0400 From: Steven Rostedt To: Ross Burton Cc: linux-kernel@vger.kernel.org, Laura Abbott Subject: Re: [PATCH] scripts/recordmcount: improve EM_METAG define checks Message-ID: <20160726172222.093c45d1@gandalf.local.home> In-Reply-To: <1468417066-13566-1-git-send-email-ross.burton@intel.com> References: <1468417066-13566-1-git-send-email-ross.burton@intel.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-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 Wed, 13 Jul 2016 14:37:46 +0100 Ross Burton wrote: > Current glibc (as of c10f90, soon to be 2.24) has an elf.h which defines > EM_METAG but doesn't also define R_METAG_ADDR32 and _NONE. This results in > recordmcount not defining any of the META symbols, and the compile failing. > > Handle this by checking each #define individually instead of assuming the > presence. > > Signed-off-by: Ross Burton Actually, Laura beat you to it: http://lkml.kernel.org/r/1468005530-14757-1-git-send-email-labbott@redhat.com I'll be applying her patch. I'll also mark it as stable, as it's come up a few times on IRC as well. I'll still add a Reported-by from you. Thanks! -- Steve > --- > scripts/recordmcount.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c > index e1675927..44ce050 100644 > --- a/scripts/recordmcount.c > +++ b/scripts/recordmcount.c > @@ -33,10 +33,14 @@ > #include > #include > > -#ifndef EM_METAG > /* Remove this when these make it to the standard system elf.h. */ > +#ifndef EM_METAG > #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 >