]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Nov 2018 08:45:49 +0000 (09:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Nov 2018 08:45:49 +0000 (09:45 +0100)
added patches:
efi-libstub-arm-support-building-with-clang.patch

queue-4.19/efi-libstub-arm-support-building-with-clang.patch [new file with mode: 0644]
queue-4.19/series

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 (file)
index 0000000..88c3fda
--- /dev/null
@@ -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
index e4d3c4f8e2ef74f1d147558e8ddd263b739aef8c..d88d848255e79fb8a89efb7bb2c0677647bca6c3 100644 (file)
@@ -1 +1,2 @@
 hid-steam-remove-input-device-when-a-hid-client-is-running.patch
+efi-libstub-arm-support-building-with-clang.patch