[PATCH] scripts/recordmcount: improve EM_METAG define checks

From: Ross Burton
Date: Wed Jul 13 2016 - 09:38:45 EST

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

Signed-off-by: Ross Burton <ross.burton@xxxxxxxxx>
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 <string.h>
#include <unistd.h>

-#ifndef EM_METAG
/* Remove this when these make it to the standard system elf.h. */
+#ifndef EM_METAG
#define EM_METAG 174
+#ifndef R_METAG_ADDR32
#define R_METAG_ADDR32 2
+#ifndef R_METAG_NONE
#define R_METAG_NONE 3