diff options
author | Andrea Adami <andrea.adami@gmail.com> | 2018-09-05 01:58:41 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-05 13:59:15 -0700 |
commit | e874880813715dbb0a630252881e3a09b59be79d (patch) | |
tree | e2f17ddc9e33ffdbc454010030e8bb1d84c21958 /meta-initramfs | |
parent | 011383b95dfbdcf7ffdaf767adc3a29c2dc839cf (diff) | |
download | meta-openembedded-e874880813715dbb0a630252881e3a09b59be79d.tar.gz |
kexec-tools-klibc: rebase x86-64 patch to remove -mcmodel=large
Patch did not apply after upgrade to latest master.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs')
-rw-r--r-- | meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch index f1db75741..0ec880ca6 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch | |||
@@ -19,15 +19,17 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile | 21 | diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile |
22 | index 7300937..38f0bf3 100644 | 22 | index 7300937..73f6932 100644 |
23 | --- a/purgatory/arch/x86_64/Makefile | 23 | --- a/purgatory/arch/x86_64/Makefile |
24 | +++ b/purgatory/arch/x86_64/Makefile | 24 | +++ b/purgatory/arch/x86_64/Makefile |
25 | @@ -23,4 +23,4 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c | 25 | @@ -24,5 +24,5 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c |
26 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c | ||
27 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c | 26 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c |
28 | 27 | ||
29 | -x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large | 28 | ifeq ($(SUBARCH),64) |
30 | +#x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large | 29 | - x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large |
30 | +# x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large | ||
31 | endif | ||
32 | |||
31 | -- | 33 | -- |
32 | 2.7.4 | 34 | 2.7.4 |
33 | 35 | ||