diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-07-17 20:08:18 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-07-17 20:08:18 +0200 |
| commit | 81193947f44e3b73b4c6fa77546397040e2ad738 (patch) | |
| tree | cc13cab99c9486938d4ba602f58aa894ad84053b /0001-tools-build-Fixup-host-c-flags.patch | |
| parent | 09fc52385ab60c870c2f2b575657fae1d87046c4 (diff) | |
| parent | cd737835d26e1ad686b989bc5a75218516600701 (diff) | |
| download | kernel-81193947f44e3b73b4c6fa77546397040e2ad738.tar.gz kernel-81193947f44e3b73b4c6fa77546397040e2ad738.tar.xz kernel-81193947f44e3b73b4c6fa77546397040e2ad738.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc5.git1.1.vanilla.knurd.1.fc29kernel-4.18.0-0.rc5.git1.1.vanilla.knurd.1.fc28kernel-4.18.0-0.rc5.git1.1.vanilla.knurd.1.fc27
Diffstat (limited to '0001-tools-build-Fixup-host-c-flags.patch')
| -rw-r--r-- | 0001-tools-build-Fixup-host-c-flags.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/0001-tools-build-Fixup-host-c-flags.patch b/0001-tools-build-Fixup-host-c-flags.patch deleted file mode 100644 index 2a99f1079..000000000 --- a/0001-tools-build-Fixup-host-c-flags.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b8c8dc142ff2f7f46060ed77b2de05c813233029 Mon Sep 17 00:00:00 2001 -From: Laura Abbott <labbott@redhat.com> -Date: Fri, 6 Jul 2018 17:11:31 -0700 -Subject: [PATCHv2 1/7] tools: build: Fixup host c flags -To: Masahiro Yamada <yamada.masahiro@socionext.com> -To: Josh Poimboeuf <jpoimboe@redhat.com> -To: Jiri Olsa <jolsa@kernel.org> -Cc: linux-kbuild@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Cc: Robin Jarry <robin.jarry@6wind.com> - -Commit 0c3b7e42616f ("tools build: Add support for host programs format") -introduced host_c_flags which referenced CHOSTFLAGS. The actual name of the -variable is HOSTCFLAGS. Fix this up. - -Fixes: 0c3b7e42616f ("tools build: Add support for host programs format") -Signed-off-by: Laura Abbott <labbott@redhat.com> ---- -v2: Also fixed another instance in perf pmu-events. ---- - tools/build/Build.include | 2 +- - tools/perf/pmu-events/Build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/build/Build.include b/tools/build/Build.include -index a4bbb984941d..b5c679cd441c 100644 ---- a/tools/build/Build.include -+++ b/tools/build/Build.include -@@ -98,4 +98,4 @@ cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXX - ### - ## HOSTCC C flags - --host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj)) -+host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(HOSTCFLAGS) -D"BUILD_STR(s)=\#s" $(HOSTCFLAGS_$(basetarget).o) $(HOSTCFLAGS_$(obj)) -diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build -index 17783913d330..215ba30b8534 100644 ---- a/tools/perf/pmu-events/Build -+++ b/tools/perf/pmu-events/Build -@@ -1,7 +1,7 @@ - hostprogs := jevents - - jevents-y += json.o jsmn.o jevents.o --CHOSTFLAGS_jevents.o = -I$(srctree)/tools/include -+HOSTCFLAGS_jevents.o = -I$(srctree)/tools/include - pmu-events-y += pmu-events.o - JDIR = pmu-events/arch/$(SRCARCH) - JSON = $(shell [ -d $(JDIR) ] && \ --- -2.17.1 - |