Proper support for parallel debuginfo and hardening flags

1 files changed, 139 insertions, 0 deletions

diff --git a/0005-treewide-Rename-HOSTLDFLAGS-to-KBUILD_HOSTLDFLAGS.patch b/0005-treewide-Rename-HOSTLDFLAGS-to-KBUILD_HOSTLDFLAGS.patch
new file mode 100644
index 000000000..e40695033
--- /dev/null
+++ b/0005-treewide-Rename-HOSTLDFLAGS-to-KBUILD_HOSTLDFLAGS.patch
@@ -0,0 +1,139 @@
+From 017d1ce33501da9e3e438066d853a874df64f1a5 Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Thu, 5 Jul 2018 14:45:52 -0700
+Subject: [PATCHv2 5/7] treewide: Rename HOSTLDFLAGS to KBUILD_HOSTLDFLAGS
+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 LDFLAGS, re-name HOSTLDFLAGS to
+KBUILD_HOSTLDFLAGS as the internal use only flags. This should not have any
+visible effects.
+
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+v2: No change
+---
+ Makefile               |  4 ++--
+ net/bpfilter/Makefile  |  2 +-
+ scripts/Makefile.host  | 10 +++++-----
+ tools/build/Makefile   |  2 +-
+ tools/objtool/Makefile |  2 +-
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 857ccd28dc36..bd2d64b89463 100644
+--- a/Makefile
++++ b/Makefile
+@@ -362,7 +362,7 @@ HOSTCXX      = g++
+ KBUILD_HOSTCFLAGS   := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \
+ 		-fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS)
+ KBUILD_HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS)
+-HOSTLDFLAGS  := $(HOST_LFS_LDFLAGS)
++KBUILD_HOSTLDFLAGS  := $(HOST_LFS_LDFLAGS)
+ HOST_LOADLIBES := $(HOST_LFS_LIBS)
+ 
+ # Make variables (CC, etc...)
+@@ -430,7 +430,7 @@ LDFLAGS :=
+ GCC_PLUGINS_CFLAGS :=
+ 
+ export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
+-export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES
++export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS HOST_LOADLIBES
+ export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
+ export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
+ 
+diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile
+index 70beeb4ad806..0947ee7f70d5 100644
+--- a/net/bpfilter/Makefile
++++ b/net/bpfilter/Makefile
+@@ -12,7 +12,7 @@ ifeq ($(CONFIG_BPFILTER_UMH), y)
+ # builtin bpfilter_umh should be compiled with -static
+ # since rootfs isn't mounted at the time of __init
+ # function is called and do_execv won't find elf interpreter
+-HOSTLDFLAGS += -static
++KBUILD_HOSTLDFLAGS += -static
+ endif
+ 
+ $(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh
+diff --git a/scripts/Makefile.host b/scripts/Makefile.host
+index 455d85aa1d37..c019d781b2c9 100644
+--- a/scripts/Makefile.host
++++ b/scripts/Makefile.host
+@@ -84,7 +84,7 @@ hostcxx_flags  = -Wp,-MD,$(depfile) $(__hostcxx_flags)
+ # Create executable from a single .c file
+ # host-csingle -> Executable
+ quiet_cmd_host-csingle 	= HOSTCC  $@
+-      cmd_host-csingle	= $(HOSTCC) $(hostc_flags) $(HOSTLDFLAGS) -o $@ $< \
++      cmd_host-csingle	= $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \
+ 	  	$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+ $(host-csingle): $(obj)/%: $(src)/%.c FORCE
+ 	$(call if_changed_dep,host-csingle)
+@@ -92,7 +92,7 @@ $(host-csingle): $(obj)/%: $(src)/%.c FORCE
+ # Link an executable based on list of .o files, all plain c
+ # host-cmulti -> executable
+ quiet_cmd_host-cmulti	= HOSTLD  $@
+-      cmd_host-cmulti	= $(HOSTCC) $(HOSTLDFLAGS) -o $@ \
++      cmd_host-cmulti	= $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \
+ 			  $(addprefix $(obj)/,$($(@F)-objs)) \
+ 			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+ $(host-cmulti): FORCE
+@@ -109,7 +109,7 @@ $(host-cobjs): $(obj)/%.o: $(src)/%.c FORCE
+ # Link an executable based on list of .o files, a mixture of .c and .cc
+ # host-cxxmulti -> executable
+ quiet_cmd_host-cxxmulti	= HOSTLD  $@
+-      cmd_host-cxxmulti	= $(HOSTCXX) $(HOSTLDFLAGS) -o $@ \
++      cmd_host-cxxmulti	= $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \
+ 			  $(foreach o,objs cxxobjs,\
+ 			  $(addprefix $(obj)/,$($(@F)-$(o)))) \
+ 			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+@@ -143,7 +143,7 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
+ # Link a shared library, based on position independent .o files
+ # *.o -> .so shared library (host-cshlib)
+ quiet_cmd_host-cshlib	= HOSTLLD -shared $@
+-      cmd_host-cshlib	= $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
++      cmd_host-cshlib	= $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
+ 			  $(addprefix $(obj)/,$($(@F:.so=-objs))) \
+ 			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+ $(host-cshlib): FORCE
+@@ -153,7 +153,7 @@ $(call multi_depend, $(host-cshlib), .so, -objs)
+ # Link a shared library, based on position independent .o files
+ # *.o -> .so shared library (host-cxxshlib)
+ quiet_cmd_host-cxxshlib	= HOSTLLD -shared $@
+-      cmd_host-cxxshlib	= $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
++      cmd_host-cxxshlib	= $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
+ 			  $(addprefix $(obj)/,$($(@F:.so=-objs))) \
+ 			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+ $(host-cxxshlib): FORCE
+diff --git a/tools/build/Makefile b/tools/build/Makefile
+index 5edf65e684ab..727050c40f09 100644
+--- a/tools/build/Makefile
++++ b/tools/build/Makefile
+@@ -43,7 +43,7 @@ $(OUTPUT)fixdep-in.o: FORCE
+ 	$(Q)$(MAKE) $(build)=fixdep
+ 
+ $(OUTPUT)fixdep: $(OUTPUT)fixdep-in.o
+-	$(QUIET_LINK)$(HOSTCC) $(HOSTLDFLAGS) -o $@ $<
++	$(QUIET_LINK)$(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ $<
+ 
+ FORCE:
+ 
+diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
+index b5d8c2964b52..c9d038f91af6 100644
+--- a/tools/objtool/Makefile
++++ b/tools/objtool/Makefile
+@@ -32,7 +32,7 @@ INCLUDES := -I$(srctree)/tools/include \
+ 	    -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)
+-LDFLAGS  += -lelf $(LIBSUBCMD) $(HOSTLDFLAGS)
++LDFLAGS  += -lelf $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
+ 
+ # Allow old libelf to be used:
+ elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)
+-- 
+2.17.1
+