From e874880813715dbb0a630252881e3a09b59be79d Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Wed, 5 Sep 2018 01:58:41 +0200 Subject: 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 Signed-off-by: Khem Raj --- .../x86-64-purgatory-Makefile-remove-unknown-flags.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meta-initramfs') 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 f1db75741a..0ec880ca60 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile -index 7300937..38f0bf3 100644 +index 7300937..73f6932 100644 --- a/purgatory/arch/x86_64/Makefile +++ b/purgatory/arch/x86_64/Makefile -@@ -23,4 +23,4 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c - x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c +@@ -24,5 +24,5 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c --x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large -+#x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large + ifeq ($(SUBARCH),64) +- x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large ++# x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large + endif + -- 2.7.4 -- cgit 1.2.3-korg