diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-09-07 08:27:27 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-12 22:47:17 +0100 |
| commit | 3f4ab836d7d9b7a994b65ab8c7ebf6ff65e6277b (patch) | |
| tree | edb83f07b99427ecec7394fc5a2b9b12cff46072 | |
| parent | 890fa3d0e71f951993252f5b94e2211b4b06670e (diff) | |
| download | openembedded-core-contrib-3f4ab836d7d9b7a994b65ab8c7ebf6ff65e6277b.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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb | 1 |
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 @@ +From a1135b3170963ba956f2364c1283864c35541295 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 7 Sep 2015 07:59:45 +0000 +Subject: [PATCH] purgatory: Pass -r directly to linker + +This helps compiling with clang since -r is not a known option for clang +where as gcc knows how to deal with it and passes it down to linker +unfiltered + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + purgatory/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/purgatory/Makefile b/purgatory/Makefile +index 2b5c061..b251353 100644 +--- a/purgatory/Makefile ++++ b/purgatory/Makefile +@@ -61,7 +61,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -I$(shell $(CC) -print-file-name=include) + $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ + -Wl,--no-undefined -nostartfiles -nostdlib \ +- -nodefaultlibs -e purgatory_start -r \ ++ -nodefaultlibs -e purgatory_start -Wl,-r \ + -Wl,-Map=$(PURGATORY_MAP) + + $(PURGATORY): $(PURGATORY_OBJS) +-- +2.5.1 + 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 \ file://kexec-aarch64.patch \ file://kexec-x32.patch \ file://0002-powerpc-change-the-memory-size-limit.patch \ + file://0001-purgatory-Pass-r-directly-to-linker.patch \ " SRC_URI[md5sum] = "6cb4d22bcec71b6e070aa8e9d990a5e6" |