1From 7e202ea55e8dd803278d9d1eac7ffd355344d6be Mon Sep 17 00:00:00 2001
2From: OpenEmbedded <oe.patch@oe>
3Date: Wed, 11 Apr 2018 22:51:00 +0200
4Subject: [PATCH] kexec-elf-rel: use our elf.h
5
6Fix:
7
8 kexec-elf-rel.c: In function 'elf_rel_load':
9 kexec-elf-rel.c:386:39: error: 'STT_NOTYPE' undeclared
10
11and similar.
12
13Upstream-Status: Inappropriate [klibc specific]
14Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
15
16---
17 kexec/arch/arm/kexec-elf-rel-arm.c       | 2 +-
18 kexec/arch/i386/kexec-elf-rel-x86.c      | 2 +-
19 kexec/arch/ppc/kexec-elf-rel-ppc.c       | 2 +-
20 kexec/arch/ppc64/kexec-elf-rel-ppc64.c   | 2 +-
21 kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 2 +-
22 kexec/kexec-elf-rel.c                    | 2 +-
23 6 files changed, 6 insertions(+), 6 deletions(-)
24
25diff --git a/kexec/arch/arm/kexec-elf-rel-arm.c b/kexec/arch/arm/kexec-elf-rel-arm.c
26index a939cf4..2551dc0 100644
27--- a/kexec/arch/arm/kexec-elf-rel-arm.c
28+++ b/kexec/arch/arm/kexec-elf-rel-arm.c
29@@ -1,5 +1,5 @@
30 #include <stdio.h>
31-#include <elf.h>
32+#include "../../../include/elf.h"
33 #include "../../kexec.h"
34 #include "../../kexec-elf.h"
35
36diff --git a/kexec/arch/i386/kexec-elf-rel-x86.c b/kexec/arch/i386/kexec-elf-rel-x86.c
37index 55a214e..e7583d1 100644
38--- a/kexec/arch/i386/kexec-elf-rel-x86.c
39+++ b/kexec/arch/i386/kexec-elf-rel-x86.c
40@@ -1,5 +1,5 @@
41 #include <stdio.h>
42-#include <elf.h>
43+#include "../../../include/elf.h"
44 #include "../../kexec.h"
45 #include "../../kexec-elf.h"
46
47diff --git a/kexec/arch/ppc/kexec-elf-rel-ppc.c b/kexec/arch/ppc/kexec-elf-rel-ppc.c
48index 1acbd86..a60c66c 100644
49--- a/kexec/arch/ppc/kexec-elf-rel-ppc.c
50+++ b/kexec/arch/ppc/kexec-elf-rel-ppc.c
51@@ -1,5 +1,5 @@
52 #include <stdio.h>
53-#include <elf.h>
54+#include "../../../include/elf.h"
55 #include "../../kexec.h"
56 #include "../../kexec-elf.h"
57
58diff --git a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c
59index 51b1354..c85f421 100644
60--- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c
61+++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c
62@@ -1,5 +1,5 @@
63 #include <stdio.h>
64-#include <elf.h>
65+#include "../../../include/elf.h"
66 #include <string.h>
67 #include "../../kexec.h"
68 #include "../../kexec-elf.h"
69diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
70index db85b44..761a4ed 100644
71--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
72+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
73@@ -1,5 +1,5 @@
74 #include <stdio.h>
75-#include <elf.h>
76+#include "../../../include/elf.h"
77 #include "../../kexec.h"
78 #include "../../kexec-elf.h"
79
80diff --git a/kexec/kexec-elf-rel.c b/kexec/kexec-elf-rel.c
81index 9a6e63d..a856636 100644
82--- a/kexec/kexec-elf-rel.c
83+++ b/kexec/kexec-elf-rel.c
84@@ -4,7 +4,7 @@
85 #include <stdio.h>
86 #include <errno.h>
87 #include <stdlib.h>
88-#include "elf.h"
89+#include "../include/elf.h"
90 #include <boot/elf_boot.h>
91 #include "kexec.h"
92 #include "kexec-elf.h"
93