From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673AbcGKTvk (ORCPT ); Mon, 11 Jul 2016 15:51:40 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37569 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932165AbcGKTvh (ORCPT ); Mon, 11 Jul 2016 15:51:37 -0400 From: Ross Burton To: linux-kernel@vger.kernel.org Subject: [PATCH] scripts/recordmcount: improve EM_METAG define checks Date: Mon, 11 Jul 2016 20:51:27 +0100 Message-Id: <1468266687-11634-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 -- 2.8.1