]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jan 2019 07:11:52 +0000 (08:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jan 2019 07:11:52 +0000 (08:11 +0100)
added patches:
tools-power-acpi-revert-to-ld-gcc.patch

queue-4.14/series
queue-4.14/tools-power-acpi-revert-to-ld-gcc.patch [new file with mode: 0644]

index b69fc34ea9b5b18311d14cfdd6c8b478ca81a684..e7bb3a69d024414a7344cc4c153fd5a19f76c744 100644 (file)
@@ -105,3 +105,4 @@ power-supply-olpc_battery-correct-the-temperature-units.patch
 lib-fix-build-failure-in-config_debug_virtual-test.patch
 drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
 bnx2x-fix-null-pointer-dereference-in-bnx2x_del_all_vlans-on-some-hw.patch
+tools-power-acpi-revert-to-ld-gcc.patch
diff --git a/queue-4.14/tools-power-acpi-revert-to-ld-gcc.patch b/queue-4.14/tools-power-acpi-revert-to-ld-gcc.patch
new file mode 100644 (file)
index 0000000..e5cbdbc
--- /dev/null
@@ -0,0 +1,41 @@
+From 755396163148b50fe1afb4bdd3365e47f3ff7a42 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 24 Apr 2018 09:43:44 +0200
+Subject: tools: power/acpi, revert to LD = gcc
+
+From: Jiri Slaby <jslaby@suse.cz>
+
+commit 755396163148b50fe1afb4bdd3365e47f3ff7a42 upstream.
+
+Commit 7ed1c1901fe5 (tools: fix cross-compile var clobbering) removed
+setting of LD to $(CROSS_COMPILE)gcc. This broke build of acpica
+(acpidump) in power/acpi:
+ ld: unrecognized option '-D_LINUX'
+
+The tools pass CFLAGS to the linker (incl. -D_LINUX), so revert this
+particular change and let LD be $(CC) again. Note that the old behaviour
+was a bit different, it used $(CROSS_COMPILE)gcc which was eliminated by
+the commit 7ed1c1901fe5. We use $(CC) for that reason.
+
+Fixes: 7ed1c1901fe5 (tools: fix cross-compile var clobbering)
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Cc: 4.16+ <stable@vger.kernel.org> # 4.16+
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Cc: Martin Kelly <martin@martingkelly.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/power/acpi/Makefile.config |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/tools/power/acpi/Makefile.config
++++ b/tools/power/acpi/Makefile.config
+@@ -56,6 +56,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+ # to compile vs uClibc, that can be done here as well.
+ CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
+ CROSS_COMPILE ?= $(CROSS)
++LD = $(CC)
+ HOSTCC = gcc
+ # check if compiler option is supported