From 35923a6327b7f9533bcd3dc6910108bcd1b5e2b5 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Sep 2019 19:11:52 +0200
Subject: [PATCH] 5.2-stable patches

added patches:
	objtool-clobber-user-cflags-variable.patch
---
 ...objtool-clobber-user-cflags-variable.patch | 40 +++++++++++++++++++
 queue-5.2/series                              |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 queue-5.2/objtool-clobber-user-cflags-variable.patch

diff --git a/queue-5.2/objtool-clobber-user-cflags-variable.patch b/queue-5.2/objtool-clobber-user-cflags-variable.patch
new file mode 100644
index 00000000000..1b0b416cb2f
--- /dev/null
+++ b/queue-5.2/objtool-clobber-user-cflags-variable.patch
@@ -0,0 +1,40 @@
+From f73b3cc39c84220e6dccd463b5c8279b03514646 Mon Sep 17 00:00:00 2001
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+Date: Thu, 29 Aug 2019 18:28:49 -0500
+Subject: objtool: Clobber user CFLAGS variable
+
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+
+commit f73b3cc39c84220e6dccd463b5c8279b03514646 upstream.
+
+If the build user has the CFLAGS variable set in their environment,
+objtool blindly appends to it, which can cause unexpected behavior.
+
+Clobber CFLAGS to ensure consistent objtool compilation behavior.
+
+Reported-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Tested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Link: https://lkml.kernel.org/r/83a276df209962e6058fcb6c615eef9d401c21bc.1567121311.git.jpoimboe@redhat.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+CC: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/objtool/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/objtool/Makefile
++++ b/tools/objtool/Makefile
+@@ -35,7 +35,7 @@ INCLUDES := -I$(srctree)/tools/include \
+ 	    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
+ 	    -I$(srctree)/tools/objtool/arch/$(ARCH)/include
+ WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
+-CFLAGS   += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
++CFLAGS   := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
+ LDFLAGS  += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
+ 
+ # Allow old libelf to be used:
diff --git a/queue-5.2/series b/queue-5.2/series
index e3fba80291c..4803e35c441 100644
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -26,3 +26,4 @@ alsa-dice-fix-wrong-packet-parameter-for-alesis-io26.patch
 alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch
 alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch
 platform-x86-i2c-multi-instantiate-derive-the-device-name-from-parent.patch
+objtool-clobber-user-cflags-variable.patch
-- 
2.47.2