summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-09-07 08:27:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:48:40 +0100
commitdecbbac612d45f92e5675a9fecfd60a236032d51 (patch)
treed1a8ac2c21cad226d5427718fe17939d71740fcf /meta/recipes-kernel
parent5b97579165f59878298941a937b81b8cfc8fc248 (diff)
downloadpoky-decbbac612d45f92e5675a9fecfd60a236032d51.tar.gz
kexec-tools: Pass -r directly to linker
-r is understood by gcc but not by clang, anyway its a linker option so pass it straight to linker by using -Wl explicitly (From OE-Core rev: 3f4ab836d7d9b7a994b65ab8c7ebf6ff65e6277b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.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-purgatory-Pass-r-directly-to-linker.patch32
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
new file mode 100644
index 0000000000..bfd077daf0
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
@@ -0,0 +1,32 @@
1From a1135b3170963ba956f2364c1283864c35541295 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Sep 2015 07:59:45 +0000
4Subject: [PATCH] purgatory: Pass -r directly to linker
5
6This helps compiling with clang since -r is not a known option for clang
7where as gcc knows how to deal with it and passes it down to linker
8unfiltered
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 purgatory/Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/purgatory/Makefile b/purgatory/Makefile
18index 2b5c061..b251353 100644
19--- a/purgatory/Makefile
20+++ b/purgatory/Makefile
21@@ -61,7 +61,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
22 -I$(shell $(CC) -print-file-name=include)
23 $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
24 -Wl,--no-undefined -nostartfiles -nostdlib \
25- -nodefaultlibs -e purgatory_start -r \
26+ -nodefaultlibs -e purgatory_start -Wl,-r \
27 -Wl,-Map=$(PURGATORY_MAP)
28
29 $(PURGATORY): $(PURGATORY_OBJS)
30--
312.5.1
32
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb
index dd7bba7031..ffdb983a41 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb
@@ -6,6 +6,7 @@ SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \
6 file://kexec-aarch64.patch \ 6 file://kexec-aarch64.patch \
7 file://kexec-x32.patch \ 7 file://kexec-x32.patch \
8 file://0002-powerpc-change-the-memory-size-limit.patch \ 8 file://0002-powerpc-change-the-memory-size-limit.patch \
9 file://0001-purgatory-Pass-r-directly-to-linker.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "6cb4d22bcec71b6e070aa8e9d990a5e6" 12SRC_URI[md5sum] = "6cb4d22bcec71b6e070aa8e9d990a5e6"