diff mbox

scripts/recordmcount: improve EM_METAG define checks

Message ID 1468417066-13566-1-git-send-email-ross.burton@intel.com
State New
Headers show

Commit Message

Ross Burton July 13, 2016, 1:37 p.m. UTC
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 <ross.burton@intel.com>

---
 scripts/recordmcount.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.8.1
diff mbox

Patch

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
+#endif
+#ifndef R_METAG_ADDR32
 #define R_METAG_ADDR32                   2
+#endif
+#ifndef R_METAG_NONE
 #define R_METAG_NONE                     3
 #endif