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

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

kbuild: Rename HOST_LOADLIBES to KBUILD_HOSTLDLIBS 



In preparation for enabling command line LDLIBS, re-name HOST_LOADLIBES
to KBUILD_HOSTLDLIBS as the internal use only flags. Also rename
existing usage to HOSTLDLIBS for consistency. 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 b90a3680

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ KBUILD_HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \ 
		-fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS)

KBUILD_HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS)

KBUILD_HOSTLDFLAGS  := $(HOST_LFS_LDFLAGS)

HOST_LOADLIBES := $(HOST_LFS_LIBS)

KBUILD_HOSTLDLIBS   := $(HOST_LFS_LIBS)



# Make variables (CC, etc...)

AS		= $(CROSS_COMPILE)as
@@ -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 KBUILD_HOSTLDFLAGS HOST_LOADLIBES

export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS

export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE

export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS

samples/bpf/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -180,12 +180,12 @@ HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/ 
HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/

HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/



HOST_LOADLIBES		+= $(LIBBPF) -lelf

HOSTLOADLIBES_tracex4		+= -lrt

HOSTLOADLIBES_trace_output	+= -lrt

HOSTLOADLIBES_map_perf_test	+= -lrt

HOSTLOADLIBES_test_overhead	+= -lrt

HOSTLOADLIBES_xdpsock		+= -pthread

KBUILD_HOSTLDLIBS		+= $(LIBBPF) -lelf

HOSTLDLIBS_tracex4		+= -lrt

HOSTLDLIBS_trace_output	+= -lrt

HOSTLDLIBS_map_perf_test	+= -lrt

HOSTLDLIBS_test_overhead	+= -lrt

HOSTLDLIBS_xdpsock		+= -pthread



# Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline:

#  make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang

samples/seccomp/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ HOSTCFLAGS_bpf-direct.o += $(MFLAG) 
HOSTCFLAGS_dropper.o += $(MFLAG)

HOSTCFLAGS_bpf-helper.o += $(MFLAG)

HOSTCFLAGS_bpf-fancy.o += $(MFLAG)

HOSTLOADLIBES_bpf-direct += $(MFLAG)

HOSTLOADLIBES_bpf-fancy += $(MFLAG)

HOSTLOADLIBES_dropper += $(MFLAG)

HOSTLDLIBS_bpf-direct += $(MFLAG)

HOSTLDLIBS_bpf-fancy += $(MFLAG)

HOSTLDLIBS_dropper += $(MFLAG)

endif

always := $(hostprogs-m)

endif

scripts/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert 


HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include

HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include

HOSTLOADLIBES_sign-file = -lcrypto

HOSTLOADLIBES_extract-cert = -lcrypto

HOSTLDLIBS_sign-file = -lcrypto

HOSTLDLIBS_extract-cert = -lcrypto



always		:= $(hostprogs-y) $(hostprogs-m)

scripts/Makefile.host

+5 −5
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags) 
# host-csingle -> Executable

quiet_cmd_host-csingle 	= HOSTCC  $@

      cmd_host-csingle	= $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \

	  	$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

		$(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))

$(host-csingle): $(obj)/%: $(src)/%.c FORCE

	$(call if_changed_dep,host-csingle)
@@ -94,7 +94,7 @@ $(host-csingle): $(obj)/%: $(src)/%.c FORCE 
quiet_cmd_host-cmulti	= HOSTLD  $@

      cmd_host-cmulti	= $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \

			  $(addprefix $(obj)/,$($(@F)-objs)) \

			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

			  $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))

$(host-cmulti): FORCE

	$(call if_changed,host-cmulti)

$(call multi_depend, $(host-cmulti), , -objs)
@@ -112,7 +112,7 @@ quiet_cmd_host-cxxmulti = HOSTLD $@ 
      cmd_host-cxxmulti	= $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \

			  $(foreach o,objs cxxobjs,\

			  $(addprefix $(obj)/,$($(@F)-$(o)))) \

			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

			  $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))

$(host-cxxmulti): FORCE

	$(call if_changed,host-cxxmulti)

$(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs)
@@ -145,7 +145,7 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE 
quiet_cmd_host-cshlib	= HOSTLLD -shared $@

      cmd_host-cshlib	= $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \

			  $(addprefix $(obj)/,$($(@F:.so=-objs))) \

			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

			  $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))

$(host-cshlib): FORCE

	$(call if_changed,host-cshlib)

$(call multi_depend, $(host-cshlib), .so, -objs)
@@ -155,7 +155,7 @@ $(call multi_depend, $(host-cshlib), .so, -objs) 
quiet_cmd_host-cxxshlib	= HOSTLLD -shared $@

      cmd_host-cxxshlib	= $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \

			  $(addprefix $(obj)/,$($(@F:.so=-objs))) \

			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

			  $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))

$(host-cxxshlib): FORCE

	$(call if_changed,host-cxxshlib)

$(call multi_depend, $(host-cxxshlib), .so, -objs)