mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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: Laura Abbott <labbott@redhat.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
b90a368000
commit
8377bd2b9e
4
Makefile
4
Makefile
|
@ -363,7 +363,7 @@ KBUILD_HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \
|
||||||
-fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS)
|
-fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS)
|
||||||
KBUILD_HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS)
|
KBUILD_HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS)
|
||||||
KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAGS)
|
KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAGS)
|
||||||
HOST_LOADLIBES := $(HOST_LFS_LIBS)
|
KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS)
|
||||||
|
|
||||||
# Make variables (CC, etc...)
|
# Make variables (CC, etc...)
|
||||||
AS = $(CROSS_COMPILE)as
|
AS = $(CROSS_COMPILE)as
|
||||||
|
@ -430,7 +430,7 @@ LDFLAGS :=
|
||||||
GCC_PLUGINS_CFLAGS :=
|
GCC_PLUGINS_CFLAGS :=
|
||||||
|
|
||||||
export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_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 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 MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
|
||||||
export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
|
export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
|
||||||
|
|
||||||
|
|
|
@ -180,12 +180,12 @@ HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/
|
||||||
HOSTCFLAGS_sampleip_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/
|
HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/
|
||||||
|
|
||||||
HOST_LOADLIBES += $(LIBBPF) -lelf
|
KBUILD_HOSTLDLIBS += $(LIBBPF) -lelf
|
||||||
HOSTLOADLIBES_tracex4 += -lrt
|
HOSTLDLIBS_tracex4 += -lrt
|
||||||
HOSTLOADLIBES_trace_output += -lrt
|
HOSTLDLIBS_trace_output += -lrt
|
||||||
HOSTLOADLIBES_map_perf_test += -lrt
|
HOSTLDLIBS_map_perf_test += -lrt
|
||||||
HOSTLOADLIBES_test_overhead += -lrt
|
HOSTLDLIBS_test_overhead += -lrt
|
||||||
HOSTLOADLIBES_xdpsock += -pthread
|
HOSTLDLIBS_xdpsock += -pthread
|
||||||
|
|
||||||
# Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline:
|
# 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
|
# make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang
|
||||||
|
|
|
@ -30,9 +30,9 @@ HOSTCFLAGS_bpf-direct.o += $(MFLAG)
|
||||||
HOSTCFLAGS_dropper.o += $(MFLAG)
|
HOSTCFLAGS_dropper.o += $(MFLAG)
|
||||||
HOSTCFLAGS_bpf-helper.o += $(MFLAG)
|
HOSTCFLAGS_bpf-helper.o += $(MFLAG)
|
||||||
HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
|
HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
|
||||||
HOSTLOADLIBES_bpf-direct += $(MFLAG)
|
HOSTLDLIBS_bpf-direct += $(MFLAG)
|
||||||
HOSTLOADLIBES_bpf-fancy += $(MFLAG)
|
HOSTLDLIBS_bpf-fancy += $(MFLAG)
|
||||||
HOSTLOADLIBES_dropper += $(MFLAG)
|
HOSTLDLIBS_dropper += $(MFLAG)
|
||||||
endif
|
endif
|
||||||
always := $(hostprogs-m)
|
always := $(hostprogs-m)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -23,8 +23,8 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
|
||||||
|
|
||||||
HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
|
HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
|
||||||
HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
|
HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
|
||||||
HOSTLOADLIBES_sign-file = -lcrypto
|
HOSTLDLIBS_sign-file = -lcrypto
|
||||||
HOSTLOADLIBES_extract-cert = -lcrypto
|
HOSTLDLIBS_extract-cert = -lcrypto
|
||||||
|
|
||||||
always := $(hostprogs-y) $(hostprogs-m)
|
always := $(hostprogs-y) $(hostprogs-m)
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags)
|
||||||
# host-csingle -> Executable
|
# host-csingle -> Executable
|
||||||
quiet_cmd_host-csingle = HOSTCC $@
|
quiet_cmd_host-csingle = HOSTCC $@
|
||||||
cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \
|
cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \
|
||||||
$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
$(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
||||||
$(host-csingle): $(obj)/%: $(src)/%.c FORCE
|
$(host-csingle): $(obj)/%: $(src)/%.c FORCE
|
||||||
$(call if_changed_dep,host-csingle)
|
$(call if_changed_dep,host-csingle)
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ $(host-csingle): $(obj)/%: $(src)/%.c FORCE
|
||||||
quiet_cmd_host-cmulti = HOSTLD $@
|
quiet_cmd_host-cmulti = HOSTLD $@
|
||||||
cmd_host-cmulti = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \
|
cmd_host-cmulti = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \
|
||||||
$(addprefix $(obj)/,$($(@F)-objs)) \
|
$(addprefix $(obj)/,$($(@F)-objs)) \
|
||||||
$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
$(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
||||||
$(host-cmulti): FORCE
|
$(host-cmulti): FORCE
|
||||||
$(call if_changed,host-cmulti)
|
$(call if_changed,host-cmulti)
|
||||||
$(call multi_depend, $(host-cmulti), , -objs)
|
$(call multi_depend, $(host-cmulti), , -objs)
|
||||||
|
@ -112,7 +112,7 @@ quiet_cmd_host-cxxmulti = HOSTLD $@
|
||||||
cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \
|
cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \
|
||||||
$(foreach o,objs cxxobjs,\
|
$(foreach o,objs cxxobjs,\
|
||||||
$(addprefix $(obj)/,$($(@F)-$(o)))) \
|
$(addprefix $(obj)/,$($(@F)-$(o)))) \
|
||||||
$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
$(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
||||||
$(host-cxxmulti): FORCE
|
$(host-cxxmulti): FORCE
|
||||||
$(call if_changed,host-cxxmulti)
|
$(call if_changed,host-cxxmulti)
|
||||||
$(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs)
|
$(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs)
|
||||||
|
@ -145,7 +145,7 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
|
||||||
quiet_cmd_host-cshlib = HOSTLLD -shared $@
|
quiet_cmd_host-cshlib = HOSTLLD -shared $@
|
||||||
cmd_host-cshlib = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
|
cmd_host-cshlib = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
|
||||||
$(addprefix $(obj)/,$($(@F:.so=-objs))) \
|
$(addprefix $(obj)/,$($(@F:.so=-objs))) \
|
||||||
$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
$(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
||||||
$(host-cshlib): FORCE
|
$(host-cshlib): FORCE
|
||||||
$(call if_changed,host-cshlib)
|
$(call if_changed,host-cshlib)
|
||||||
$(call multi_depend, $(host-cshlib), .so, -objs)
|
$(call multi_depend, $(host-cshlib), .so, -objs)
|
||||||
|
@ -155,7 +155,7 @@ $(call multi_depend, $(host-cshlib), .so, -objs)
|
||||||
quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
|
quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
|
||||||
cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
|
cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
|
||||||
$(addprefix $(obj)/,$($(@F:.so=-objs))) \
|
$(addprefix $(obj)/,$($(@F:.so=-objs))) \
|
||||||
$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
$(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
||||||
$(host-cxxshlib): FORCE
|
$(host-cxxshlib): FORCE
|
||||||
$(call if_changed,host-cxxshlib)
|
$(call if_changed,host-cxxshlib)
|
||||||
$(call multi_depend, $(host-cxxshlib), .so, -objs)
|
$(call multi_depend, $(host-cxxshlib), .so, -objs)
|
||||||
|
|
|
@ -169,7 +169,7 @@ HOSTCFLAGS_zconf.tab.o := -I$(src)
|
||||||
hostprogs-y += nconf
|
hostprogs-y += nconf
|
||||||
nconf-objs := nconf.o zconf.tab.o nconf.gui.o
|
nconf-objs := nconf.o zconf.tab.o nconf.gui.o
|
||||||
|
|
||||||
HOSTLOADLIBES_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs)
|
HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs)
|
||||||
HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
|
HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
|
||||||
HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
|
HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
|
||||||
|
|
||||||
|
@ -180,7 +180,7 @@ hostprogs-y += mconf
|
||||||
lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
|
lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
|
||||||
mconf-objs := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog))
|
mconf-objs := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog))
|
||||||
|
|
||||||
HOSTLOADLIBES_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
|
HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
|
||||||
$(foreach f, mconf.o $(lxdialog), \
|
$(foreach f, mconf.o $(lxdialog), \
|
||||||
$(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
|
$(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
|
||||||
|
|
||||||
|
@ -191,7 +191,7 @@ hostprogs-y += qconf
|
||||||
qconf-cxxobjs := qconf.o
|
qconf-cxxobjs := qconf.o
|
||||||
qconf-objs := zconf.tab.o
|
qconf-objs := zconf.tab.o
|
||||||
|
|
||||||
HOSTLOADLIBES_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
|
HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
|
||||||
HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
|
HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
|
||||||
|
|
||||||
$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
|
$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
|
||||||
|
@ -206,7 +206,7 @@ $(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
|
||||||
hostprogs-y += gconf
|
hostprogs-y += gconf
|
||||||
gconf-objs := gconf.o zconf.tab.o
|
gconf-objs := gconf.o zconf.tab.o
|
||||||
|
|
||||||
HOSTLOADLIBES_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
|
HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
|
||||||
HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
|
HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
|
||||||
|
|
||||||
$(obj)/gconf.o: $(obj)/.gconf-cfg
|
$(obj)/gconf.o: $(obj)/.gconf-cfg
|
||||||
|
|
Loading…
Reference in a new issue