From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 11 Apr 2022 12:21:26 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.9.310~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3a798f365e9702058761c8212fec161870b9f16;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch
---

diff --git a/queue-4.9/series b/queue-4.9/series
index c6ca7d75cfd..bdbdbc4c324 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -195,3 +195,4 @@ x86-pm-save-the-msr-validity-status-at-context-setup.patch
 x86-speculation-restore-speculation-related-msrs-during-s3-resume.patch
 arm64-patch_text-fixup-last-cpu-should-be-master.patch
 irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch
+tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch
diff --git a/queue-4.9/tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch b/queue-4.9/tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch
new file mode 100644
index 00000000000..b35d63a1f06
--- /dev/null
+++ b/queue-4.9/tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch
@@ -0,0 +1,48 @@
+From 541f695cbcb6932c22638b06e0cbe1d56177e2e9 Mon Sep 17 00:00:00 2001
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+Date: Mon, 4 Apr 2022 17:28:48 -0300
+Subject: tools build: Use $(shell ) instead of `` to get embedded libperl's ccopts
+
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+
+commit 541f695cbcb6932c22638b06e0cbe1d56177e2e9 upstream.
+
+Just like its done for ldopts and for both in tools/perf/Makefile.config.
+
+Using `` to initialize PERL_EMBED_CCOPTS somehow precludes using:
+
+  $(filter-out SOMETHING_TO_FILTER,$(PERL_EMBED_CCOPTS))
+
+And we need to do it to allow for building with versions of clang where
+some gcc options selected by distros are not available.
+
+Tested-by: Sedat Dilek <sedat.dilek@gmail.com> # Debian/Selfmade LLVM-14 (x86-64)
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Fangrui Song <maskray@google.com>
+Cc: Florian Fainelli <f.fainelli@gmail.com>
+Cc: Ian Rogers <irogers@google.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: John Keeping <john@metanate.com>
+Cc: Leo Yan <leo.yan@linaro.org>
+Cc: Michael Petlan <mpetlan@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Nathan Chancellor <nathan@kernel.org>
+Cc: Nick Desaulniers <ndesaulniers@google.com>
+Link: http://lore.kernel.org/lkml/YktYX2OnLtyobRYD@kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/build/feature/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/build/feature/Makefile
++++ b/tools/build/feature/Makefile
+@@ -162,7 +162,7 @@ strip-libs = $(filter-out -l%,$(1))
+ PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null)
+ PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
+ PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
+-PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`
++PERL_EMBED_CCOPTS = $(shell perl -MExtUtils::Embed -e ccopts 2>/dev/null)
+ FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
+ 
+ $(OUTPUT)test-libperl.bin: