From 4196017cd0e50e434ee72ca706742804f75c8827 Mon Sep 17 00:00:00 2001

From: Laura Abbott <labbott@fedoraproject.org>

Date: Fri, 8 Jul 2016 11:15:43 -0700

Subject: [PATCH] Work around for addition of metag def but not relocations

Caused by commit in sync up from

http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/commit/?id=9a78be1808600ca5e66eab741542447a29cfbeb3

Fixes build errors like:

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 = R_METAG_ADDR32;

                            ^~~~~~~~~~~~~~

scripts/recordmcount.c:466:28: note: each undeclared identifier is reported only once for each function it appears in

scripts/recordmcount.c:468:20: error: 'R_METAG_NONE' undeclared (first use in this function)

     rel_type_nop = R_METAG_NONE;

                    ^~~~~~~~~~~~

Signed-off-by: Laura Abbott <labbott@fedoraproject.org>

---

 scripts/recordmcount.c | 9 ++++++++-

 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c

index e1675927..42396a7 100644

--- a/scripts/recordmcount.c

+++ b/scripts/recordmcount.c

@@ -33,10 +33,17 @@

 #include <string.h>

 #include <unistd.h>

+/*

+ * glibc synced up and added the metag number but didn't add the relocations.

+ * 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

-- 

2.9.0