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