Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b90a3680 authored by Laura Abbott's avatar Laura Abbott Committed by Masahiro Yamada
Browse files

kbuild: Rename HOSTLDFLAGS to KBUILD_HOSTLDFLAGS 



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: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 10844aeb

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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

net/bpfilter/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

scripts/Makefile.host

+5 −5
Original line number Diff line number Diff line
@@ -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

tools/build/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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:

tools/objtool/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)