summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch33
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch
new file mode 100644
index 0000000000..786fc0ce41
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch
@@ -0,0 +1,33 @@
1From a12dfe9be05f9dee96c7637a20c01e05711c563c Mon Sep 17 00:00:00 2001
2From: David Michael <david.michael@coreos.com>
3Date: Sun, 7 Jan 11:26:57 2018 -0500
4Subject: [PATCH] arm64: Set -fno-PIC along with -mcmodel=large
5
6As seen in GCC's gcc/config/aarch64/aarch64.c, -fPIC with large
7code model is unsupported. This fixes the "sorry, unimplemented"
8errors when building with compilers defaulting to -fPIC.
9
10Upstream-Status: Backport
11
12Signed-off-by: Simon Horman <horms@verge.net.au>
13Signed-off-by: David Michael <david.michael@coreos.com>
14Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
15---
16 purgatory/arch/arm64/Makefile | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/purgatory/arch/arm64/Makefile b/purgatory/arch/arm64/Makefile
20index 636abea..80068ca 100644
21--- a/purgatory/arch/arm64/Makefile
22+++ b/purgatory/arch/arm64/Makefile
23@@ -1,6 +1,7 @@
24
25 arm64_PURGATORY_EXTRA_CFLAGS = \
26 -mcmodel=large \
27+ -fno-PIC \
28 -fno-stack-protector \
29 -fno-asynchronous-unwind-tables \
30 -Wundef \
31--
322.7.4
33
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
index ebb4832684..bd87b371c2 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
@@ -20,6 +20,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
20 file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ 20 file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
21 file://kexec-x32.patch \ 21 file://kexec-x32.patch \
22 file://0001-Disable-PIE-during-link.patch \ 22 file://0001-Disable-PIE-during-link.patch \
23 file://0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "5198968de79b5ded96f97f3c2ea9637b" 26SRC_URI[md5sum] = "5198968de79b5ded96f97f3c2ea9637b"