summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-06-12 07:59:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-13 10:46:34 +0100
commit3a61329052085c990becf21dd915d587d7cbc5ad (patch)
treebad0c3b6604c4b042e0f556057e0cec9b36a1110 /meta/recipes-kernel
parent98a967d10d11dd3d086604c822385a71b21031f9 (diff)
downloadpoky-3a61329052085c990becf21dd915d587d7cbc5ad.tar.gz
kexec-tools: Pass -no-pie to linker
- This matches the linker flags to compiler flags in purgatory - Compile arm64 without PIC (From OE-Core rev: 653299d8c31eac6147b8183d9ec7ef82b7202cab) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch31
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch31
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb2
3 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch
new file mode 100644
index 0000000000..3f2f85e337
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch
@@ -0,0 +1,31 @@
1From ea7be6d71b85880e8e8a2c8a4f49a696c5f31ae4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 10 Jun 2017 11:18:49 -0700
4Subject: [PATCH] Disable PIE during link
5
6We have explcitly disabled PIE during compile so we
7just need to match it with linker flags
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 purgatory/Makefile | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/purgatory/Makefile b/purgatory/Makefile
17index 564bdb7..a08e41f 100644
18--- a/purgatory/Makefile
19+++ b/purgatory/Makefile
20@@ -59,7 +59,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
21 -Iinclude \
22 -I$(shell $(CC) -print-file-name=include)
23 $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
24- -Wl,--no-undefined -nostartfiles -nostdlib \
25+ -Wl,--no-undefined -no-pie -nostartfiles -nostdlib \
26 -nodefaultlibs -e purgatory_start -Wl,-r \
27 -Wl,-Map=$(PURGATORY_MAP)
28
29--
302.13.1
31
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch
new file mode 100644
index 0000000000..84e94d7d93
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch
@@ -0,0 +1,31 @@
1From 3bb73e5e5649b455e15d5ca3a7ad1a90c4960972 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 10 Jun 2017 11:54:36 -0700
4Subject: [PATCH] arm64: Disable PIC
5
6Fix
7| cc1: sorry, unimplemented: code model 'large' with -fPIC
8| make: *** [Makefile:118: purgatory/arch/arm64/entry.o] Error 1
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 purgatory/arch/arm64/Makefile | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/purgatory/arch/arm64/Makefile b/purgatory/arch/arm64/Makefile
18index 636abea..80068ca 100644
19--- a/purgatory/arch/arm64/Makefile
20+++ b/purgatory/arch/arm64/Makefile
21@@ -1,6 +1,7 @@
22
23 arm64_PURGATORY_EXTRA_CFLAGS = \
24 -mcmodel=large \
25+ -fno-PIC \
26 -fno-stack-protector \
27 -fno-asynchronous-unwind-tables \
28 -Wundef \
29--
302.13.1
31
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb
index 90d5985801..4caca933c7 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb
@@ -19,6 +19,8 @@ SRC_URI += "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.g
19 file://0001-x86-x86_64-Fix-format-warning-with-die.patch \ 19 file://0001-x86-x86_64-Fix-format-warning-with-die.patch \
20 file://0002-ppc-Fix-format-warning-with-die.patch \ 20 file://0002-ppc-Fix-format-warning-with-die.patch \
21 file://kexec-x32.patch \ 21 file://kexec-x32.patch \
22 file://0001-Disable-PIE-during-link.patch \
23 file://0001-arm64-Disable-PIC.patch \
22 " 24 "
23 25
24SRC_URI[md5sum] = "b2b2c5e6b29d467d6e99d587fb6b7cf5" 26SRC_URI[md5sum] = "b2b2c5e6b29d467d6e99d587fb6b7cf5"