From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 28 Nov 2018 08:45:49 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v4.19.6~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f21d5460b710d04137b4385df75ca2a6473b915;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	efi-libstub-arm-support-building-with-clang.patch
---

diff --git a/queue-4.19/efi-libstub-arm-support-building-with-clang.patch b/queue-4.19/efi-libstub-arm-support-building-with-clang.patch
new file mode 100644
index 00000000000..88c3fdafd02
--- /dev/null
+++ b/queue-4.19/efi-libstub-arm-support-building-with-clang.patch
@@ -0,0 +1,40 @@
+From 41f1c48420709470c51ee0e54b6fb28b956bb4e0 Mon Sep 17 00:00:00 2001
+From: Alistair Strachan <astrachan@google.com>
+Date: Thu, 9 Aug 2018 09:40:42 -0700
+Subject: efi/libstub: arm: support building with clang
+
+From: Alistair Strachan <astrachan@google.com>
+
+commit 41f1c48420709470c51ee0e54b6fb28b956bb4e0 upstream.
+
+When building with CONFIG_EFI and CONFIG_EFI_STUB on ARM, the libstub
+Makefile would use -mno-single-pic-base without checking it was
+supported by the compiler. As the ARM (32-bit) clang backend does not
+support this flag, the build would fail.
+
+This changes the Makefile to check the compiler's support for
+-mno-single-pic-base before using it, similar to c1c386681bd7 ("ARM:
+8767/1: add support for building ARM kernel with clang").
+
+Signed-off-by: Alistair Strachan <astrachan@google.com>
+Reviewed-by: Stefan Agner <stefan@agner.ch>
+Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Cc: Nick Desaulniers <ndesaulniers@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/firmware/efi/libstub/Makefile |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/firmware/efi/libstub/Makefile
++++ b/drivers/firmware/efi/libstub/Makefile
+@@ -16,7 +16,8 @@ cflags-$(CONFIG_X86)		+= -m$(BITS) -D__K
+ cflags-$(CONFIG_ARM64)		:= $(subst -pg,,$(KBUILD_CFLAGS)) -fpie \
+ 				   $(DISABLE_STACKLEAK_PLUGIN)
+ cflags-$(CONFIG_ARM)		:= $(subst -pg,,$(KBUILD_CFLAGS)) \
+-				   -fno-builtin -fpic -mno-single-pic-base
++				   -fno-builtin -fpic \
++				   $(call cc-option,-mno-single-pic-base)
+ 
+ cflags-$(CONFIG_EFI_ARMSTUB)	+= -I$(srctree)/scripts/dtc/libfdt
+ 
diff --git a/queue-4.19/series b/queue-4.19/series
index e4d3c4f8e2e..d88d848255e 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1 +1,2 @@
 hid-steam-remove-input-device-when-a-hid-client-is-running.patch
+efi-libstub-arm-support-building-with-clang.patch