1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

glibc: add more Imagination Meta relocation to elf.h

glibc master added the EM_METAG tag but didn't add the relocation defines.
However the kernel tooling only checks for EM_METAG when defining its own values
so scripts/recordmcount ends up using R_META_* symbols without their definition.

Whilst the kernel can and should be fixed, this breaks all users of recordmcount
so patch elf.h to add the values.

(From OE-Core rev: 61f73ae289bf8dfe72d5f4beaac966fb4ac8dc90)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2016-07-11 22:03:38 +01:00
committed by Richard Purdie
parent ea439968b6
commit a219424914
2 changed files with 33 additions and 0 deletions
@@ -0,0 +1,32 @@
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
From a495656665cd4a4f97744741a4741eafa621d65b Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Mon, 11 Jul 2016 16:57:38 +0100
Subject: [PATCH] elf.h: add relocations for Imagination META
Adding EM_METAG but not the relocations means the kernel doesn't compile as it
guards its own declarations on the presence of EM_METAG.
---
elf/elf.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/elf/elf.h b/elf/elf.h
index b6112d9..69e85a7 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -3677,6 +3677,10 @@ enum
#define R_TILEGX_NUM 130
+/* Imagination META relocs */
+#define R_METAG_ADDR32 2
+#define R_METAG_NONE 3
+
/* BPF specific declarations. */
#define R_BPF_NONE 0 /* No reloc */
--
2.8.1
+1
View File
@@ -37,6 +37,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0023-eglibc-Install-PIC-archives.patch \
file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \
file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
file://elf-meta.patch \
"
SRC_URI += "\