diff options
Diffstat (limited to '0003-treewide-Rename-HOSTCFLAGS-KBUILD_HOSTCFLAGS.patch')
| -rw-r--r-- | 0003-treewide-Rename-HOSTCFLAGS-KBUILD_HOSTCFLAGS.patch | 150 |
1 files changed, 0 insertions, 150 deletions
diff --git a/0003-treewide-Rename-HOSTCFLAGS-KBUILD_HOSTCFLAGS.patch b/0003-treewide-Rename-HOSTCFLAGS-KBUILD_HOSTCFLAGS.patch deleted file mode 100644 index 504be373d..000000000 --- a/0003-treewide-Rename-HOSTCFLAGS-KBUILD_HOSTCFLAGS.patch +++ /dev/null @@ -1,150 +0,0 @@ -From af0b06e726242516da9df5071e4e058f949f2240 Mon Sep 17 00:00:00 2001 -From: Laura Abbott <labbott@redhat.com> -Date: Thu, 5 Jul 2018 14:39:20 -0700 -Subject: [PATCHv2] treewide: Rename HOSTCFLAGS -> KBUILD_HOSTCFLAGS -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> - -In preparation for enabling command line CFLAGS, re-name HOSTCFLAGS to -KBUILD_HOSTCFLAGS as the internal use only flags. This should not have any -visible effects. - -Signed-off-by: Laura Abbott <labbott@redhat.com> ---- -v2: Dropped name change for individual files (still CHOSTFLAGS_foo) ---- - Makefile | 4 ++-- - arch/alpha/boot/Makefile | 2 +- - net/bpfilter/Makefile | 2 +- - samples/bpf/Makefile | 10 +++++----- - scripts/Kbuild.include | 2 +- - scripts/Makefile.host | 2 +- - tools/build/Build.include | 2 +- - tools/objtool/Makefile | 2 +- - 8 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 925c55f2524f..1feec222f3c1 100644 ---- a/Makefile -+++ b/Makefile -@@ -359,7 +359,7 @@ HOST_LFS_LIBS := $(shell getconf LFS_LIBS) - - HOSTCC = gcc - HOSTCXX = g++ --HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \ -+KBUILD_HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \ - -fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS) - HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS) - HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) -@@ -429,7 +429,7 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds - LDFLAGS := - GCC_PLUGINS_CFLAGS := - --export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC -+export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES - export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE - export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -diff --git a/arch/alpha/boot/Makefile b/arch/alpha/boot/Makefile -index 0cbe4c59d3ce..dfccf0195306 100644 ---- a/arch/alpha/boot/Makefile -+++ b/arch/alpha/boot/Makefile -@@ -14,7 +14,7 @@ targets := vmlinux.gz vmlinux \ - tools/bootpzh bootloader bootpheader bootpzheader - OBJSTRIP := $(obj)/tools/objstrip - --HOSTCFLAGS := -Wall -I$(objtree)/usr/include -+KBUILD_HOSTCFLAGS := -Wall -I$(objtree)/usr/include - BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj) - - # SRM bootable image. Copy to offset 512 of a partition. -diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile -index 39c6980b5d99..70beeb4ad806 100644 ---- a/net/bpfilter/Makefile -+++ b/net/bpfilter/Makefile -@@ -5,7 +5,7 @@ - - hostprogs-y := bpfilter_umh - bpfilter_umh-objs := main.o --HOSTCFLAGS += -I. -Itools/include/ -Itools/include/uapi -+KBUILD_HOSTCFLAGS += -I. -Itools/include/ -Itools/include/uapi - HOSTCC := $(CC) - - ifeq ($(CONFIG_BPFILTER_UMH), y) -diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile -index 1303af10e54d..494ef04c56cc 100644 ---- a/samples/bpf/Makefile -+++ b/samples/bpf/Makefile -@@ -164,11 +164,11 @@ always += xdpsock_kern.o - always += xdp_fwd_kern.o - always += task_fd_query_kern.o - --HOSTCFLAGS += -I$(objtree)/usr/include --HOSTCFLAGS += -I$(srctree)/tools/lib/ --HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ --HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include --HOSTCFLAGS += -I$(srctree)/tools/perf -+KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include -+KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/ -+KBUILD_HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ -+KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include -+KBUILD_HOSTCFLAGS += -I$(srctree)/tools/perf - - HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable - HOSTCFLAGS_trace_helpers.o += -I$(srctree)/tools/lib/bpf/ -diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include -index c8156d61678c..827344dfb185 100644 ---- a/scripts/Kbuild.include -+++ b/scripts/Kbuild.include -@@ -126,7 +126,7 @@ cc-option = $(call __cc-option, $(CC),\ - # hostcc-option - # Usage: cflags-y += $(call hostcc-option,-march=winchip-c6,-march=i586) - hostcc-option = $(call __cc-option, $(HOSTCC),\ -- $(HOSTCFLAGS) $(HOST_EXTRACFLAGS),$(1),$(2)) -+ $(KBUILD_HOSTCFLAGS) $(HOST_EXTRACFLAGS),$(1),$(2)) - - # cc-option-yn - # Usage: flag := $(call cc-option-yn,-march=winchip-c6) -diff --git a/scripts/Makefile.host b/scripts/Makefile.host -index aa971cc3f339..09f00dae21fe 100644 ---- a/scripts/Makefile.host -+++ b/scripts/Makefile.host -@@ -62,7 +62,7 @@ host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs)) - ##### - # Handle options to gcc. Support building with separate output directory - --_hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ -+_hostc_flags = $(KBUILD_HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ - $(HOSTCFLAGS_$(basetarget).o) - _hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ - $(HOSTCXXFLAGS_$(basetarget).o) -diff --git a/tools/build/Build.include b/tools/build/Build.include -index b5c679cd441c..a75fa0b6ffc0 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,$@ $(HOSTCFLAGS) -D"BUILD_STR(s)=\#s" $(HOSTCFLAGS_$(basetarget).o) $(HOSTCFLAGS_$(obj)) -+host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(KBUILD_HOSTCFLAGS) -D"BUILD_STR(s)=\#s" $(HOSTCFLAGS_$(basetarget).o) $(HOSTCFLAGS_$(obj)) -diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile -index f76d9914686a..b5d8c2964b52 100644 ---- a/tools/objtool/Makefile -+++ b/tools/objtool/Makefile -@@ -31,7 +31,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) $(HOSTCFLAGS) -g $(INCLUDES) -+CFLAGS += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) - LDFLAGS += -lelf $(LIBSUBCMD) $(HOSTLDFLAGS) - - # Allow old libelf to be used: --- -2.17.1 - |