From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Sep 2019 17:11:03 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v5.3.2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76caf4570e0e1b5a992b25574af695998af43d0e;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	objtool-clobber-user-cflags-variable.patch
---

diff --git a/queue-4.9/objtool-clobber-user-cflags-variable.patch b/queue-4.9/objtool-clobber-user-cflags-variable.patch
new file mode 100644
index 00000000000..b535cd7df06
--- /dev/null
+++ b/queue-4.9/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
+@@ -32,7 +32,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   += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)
++CFLAGS   := -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)
+ LDFLAGS  += -lelf $(LIBSUBCMD)
+ 
+ # Allow old libelf to be used:
diff --git a/queue-4.9/series b/queue-4.9/series
index d4c44d55ee6..fb48fd34e5e 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -8,3 +8,4 @@ crypto-talitos-fix-missing-break-in-switch-statement.patch
 media-tvp5150-fix-switch-exit-in-set-control-handler.patch
 asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch
 alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch
+objtool-clobber-user-cflags-variable.patch