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.
Unified · Split
| @@ -363,7 +363,7 @@ KBUILD_HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \ · 362 unmodified lines | |||
| 363 | -fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS) | 363 | -fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS) |
| 364 | KBUILD_HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS) | 364 | KBUILD_HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS) |
| 365 | KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) | 365 | KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) |
| 366 | HOST_LOADLIBES := $(HOST_LFS_LIBS) | 366 | KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS) |
| 367 | 367 | ||
| 368 | # Make variables (CC, etc...) | 368 | # Make variables (CC, etc...) |
| 369 | AS = $(CROSS_COMPILE)as | 369 | AS = $(CROSS_COMPILE)as |
| @@ -430,7 +430,7 @@ LDFLAGS := · 60 unmodified lines | |||
| 430 | GCC_PLUGINS_CFLAGS := | 430 | GCC_PLUGINS_CFLAGS := |
| 431 | 431 | ||
| 432 | export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC | 432 | export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC |
| 433 | export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS HOST_LOADLIBES | 433 | export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS |
| 434 | export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE | 434 | export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE |
| 435 | export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS | 435 | export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS |
| 436 | 436 | ||
| @@ -180,12 +180,12 @@ HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/ · 179 unmodified lines | |||
| 180 | HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/ | 180 | HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/ |
| 181 | HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/ | 181 | HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/ |
| 182 | 182 | ||
| 183 | HOST_LOADLIBES += $(LIBBPF) -lelf | 183 | KBUILD_HOSTLDLIBS += $(LIBBPF) -lelf |
| 184 | HOSTLOADLIBES_tracex4 += -lrt | 184 | HOSTLDLIBS_tracex4 += -lrt |
| 185 | HOSTLOADLIBES_trace_output += -lrt | 185 | HOSTLDLIBS_trace_output += -lrt |
| 186 | HOSTLOADLIBES_map_perf_test += -lrt | 186 | HOSTLDLIBS_map_perf_test += -lrt |
| 187 | HOSTLOADLIBES_test_overhead += -lrt | 187 | HOSTLDLIBS_test_overhead += -lrt |
| 188 | HOSTLOADLIBES_xdpsock += -pthread | 188 | HOSTLDLIBS_xdpsock += -pthread |
| 189 | 189 | ||
| 190 | # Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline: | 190 | # Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline: |
| 191 | # make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang | 191 | # make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang |
| @@ -30,9 +30,9 @@ HOSTCFLAGS_bpf-direct.o += $(MFLAG) · 29 unmodified lines | |||
| 30 | HOSTCFLAGS_dropper.o += $(MFLAG) | 30 | HOSTCFLAGS_dropper.o += $(MFLAG) |
| 31 | HOSTCFLAGS_bpf-helper.o += $(MFLAG) | 31 | HOSTCFLAGS_bpf-helper.o += $(MFLAG) |
| 32 | HOSTCFLAGS_bpf-fancy.o += $(MFLAG) | 32 | HOSTCFLAGS_bpf-fancy.o += $(MFLAG) |
| 33 | HOSTLOADLIBES_bpf-direct += $(MFLAG) | 33 | HOSTLDLIBS_bpf-direct += $(MFLAG) |
| 34 | HOSTLOADLIBES_bpf-fancy += $(MFLAG) | 34 | HOSTLDLIBS_bpf-fancy += $(MFLAG) |
| 35 | HOSTLOADLIBES_dropper += $(MFLAG) | 35 | HOSTLDLIBS_dropper += $(MFLAG) |
| 36 | endif | 36 | endif |
| 37 | always := $(hostprogs-m) | 37 | always := $(hostprogs-m) |
| 38 | endif | 38 | endif |
| @@ -23,8 +23,8 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert · 22 unmodified lines | |||
| 23 | 23 | ||
| 24 | HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include | 24 | HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include |
| 25 | HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include | 25 | HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include |
| 26 | HOSTLOADLIBES_sign-file = -lcrypto | 26 | HOSTLDLIBS_sign-file = -lcrypto |
| 27 | HOSTLOADLIBES_extract-cert = -lcrypto | 27 | HOSTLDLIBS_extract-cert = -lcrypto |
| 28 | 28 | ||
| 29 | always := $(hostprogs-y) $(hostprogs-m) | 29 | always := $(hostprogs-y) $(hostprogs-m) |
| 30 | 30 | ||
| @@ -85,7 +85,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags) · 84 unmodified lines | |||
| 85 | # host-csingle -> Executable | 85 | # host-csingle -> Executable |
| 86 | quiet_cmd_host-csingle = HOSTCC $@ | 86 | quiet_cmd_host-csingle = HOSTCC $@ |
| 87 | cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \ | 87 | cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \ |
| 88 | $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | 88 | $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) |
| 89 | $(host-csingle): $(obj)/%: $(src)/%.c FORCE | 89 | $(host-csingle): $(obj)/%: $(src)/%.c FORCE |
| 90 | $(call if_changed_dep,host-csingle) | 90 | $(call if_changed_dep,host-csingle) |
| 91 | 91 | ||
| @@ -94,7 +94,7 @@ $(host-csingle): $(obj)/%: $(src)/%.c FORCE · 2 unmodified lines | |||
| 94 | quiet_cmd_host-cmulti = HOSTLD $@ | 94 | quiet_cmd_host-cmulti = HOSTLD $@ |
| 95 | cmd_host-cmulti = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \ | 95 | cmd_host-cmulti = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \ |
| 96 | $(addprefix $(obj)/,$($(@F)-objs)) \ | 96 | $(addprefix $(obj)/,$($(@F)-objs)) \ |
| 97 | $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | 97 | $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) |
| 98 | $(host-cmulti): FORCE | 98 | $(host-cmulti): FORCE |
| 99 | $(call if_changed,host-cmulti) | 99 | $(call if_changed,host-cmulti) |
| 100 | $(call multi_depend, $(host-cmulti), , -objs) | 100 | $(call multi_depend, $(host-cmulti), , -objs) |
| @@ -112,7 +112,7 @@ quiet_cmd_host-cxxmulti = HOSTLD $@ · 11 unmodified lines | |||
| 112 | cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \ | 112 | cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \ |
| 113 | $(foreach o,objs cxxobjs,\ | 113 | $(foreach o,objs cxxobjs,\ |
| 114 | $(addprefix $(obj)/,$($(@F)-$(o)))) \ | 114 | $(addprefix $(obj)/,$($(@F)-$(o)))) \ |
| 115 | $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | 115 | $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) |
| 116 | $(host-cxxmulti): FORCE | 116 | $(host-cxxmulti): FORCE |
| 117 | $(call if_changed,host-cxxmulti) | 117 | $(call if_changed,host-cxxmulti) |
| 118 | $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) | 118 | $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) |
| @@ -145,7 +145,7 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE · 26 unmodified lines | |||
| 145 | quiet_cmd_host-cshlib = HOSTLLD -shared $@ | 145 | quiet_cmd_host-cshlib = HOSTLLD -shared $@ |
| 146 | cmd_host-cshlib = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ | 146 | cmd_host-cshlib = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ |
| 147 | $(addprefix $(obj)/,$($(@F:.so=-objs))) \ | 147 | $(addprefix $(obj)/,$($(@F:.so=-objs))) \ |
| 148 | $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | 148 | $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) |
| 149 | $(host-cshlib): FORCE | 149 | $(host-cshlib): FORCE |
| 150 | $(call if_changed,host-cshlib) | 150 | $(call if_changed,host-cshlib) |
| 151 | $(call multi_depend, $(host-cshlib), .so, -objs) | 151 | $(call multi_depend, $(host-cshlib), .so, -objs) |
| @@ -155,7 +155,7 @@ $(call multi_depend, $(host-cshlib), .so, -objs) · 3 unmodified lines | |||
| 155 | quiet_cmd_host-cxxshlib = HOSTLLD -shared $@ | 155 | quiet_cmd_host-cxxshlib = HOSTLLD -shared $@ |
| 156 | cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ | 156 | cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ |
| 157 | $(addprefix $(obj)/,$($(@F:.so=-objs))) \ | 157 | $(addprefix $(obj)/,$($(@F:.so=-objs))) \ |
| 158 | $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | 158 | $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) |
| 159 | $(host-cxxshlib): FORCE | 159 | $(host-cxxshlib): FORCE |
| 160 | $(call if_changed,host-cxxshlib) | 160 | $(call if_changed,host-cxxshlib) |
| 161 | $(call multi_depend, $(host-cxxshlib), .so, -objs) | 161 | $(call multi_depend, $(host-cxxshlib), .so, -objs) |
| @@ -169,7 +169,7 @@ HOSTCFLAGS_zconf.tab.o := -I$(src) · 168 unmodified lines | |||
| 169 | hostprogs-y += nconf | 169 | hostprogs-y += nconf |
| 170 | nconf-objs := nconf.o zconf.tab.o nconf.gui.o | 170 | nconf-objs := nconf.o zconf.tab.o nconf.gui.o |
| 171 | 171 | ||
| 172 | HOSTLOADLIBES_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs) | 172 | HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs) |
| 173 | HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) | 173 | HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) |
| 174 | HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) | 174 | HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) |
| 175 | 175 | ||
| @@ -180,7 +180,7 @@ hostprogs-y += mconf · 4 unmodified lines | |||
| 180 | lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o | 180 | lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o |
| 181 | mconf-objs := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog)) | 181 | mconf-objs := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog)) |
| 182 | 182 | ||
| 183 | HOSTLOADLIBES_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs) | 183 | HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs) |
| 184 | $(foreach f, mconf.o $(lxdialog), \ | 184 | $(foreach f, mconf.o $(lxdialog), \ |
| 185 | $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags))) | 185 | $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags))) |
| 186 | 186 | ||
| @@ -191,7 +191,7 @@ hostprogs-y += qconf · 4 unmodified lines | |||
| 191 | qconf-cxxobjs := qconf.o | 191 | qconf-cxxobjs := qconf.o |
| 192 | qconf-objs := zconf.tab.o | 192 | qconf-objs := zconf.tab.o |
| 193 | 193 | ||
| 194 | HOSTLOADLIBES_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs) | 194 | HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs) |
| 195 | HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags) | 195 | HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags) |
| 196 | 196 | ||
| 197 | $(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc | 197 | $(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc |
| @@ -206,7 +206,7 @@ $(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg · 8 unmodified lines | |||
| 206 | hostprogs-y += gconf | 206 | hostprogs-y += gconf |
| 207 | gconf-objs := gconf.o zconf.tab.o | 207 | gconf-objs := gconf.o zconf.tab.o |
| 208 | 208 | ||
| 209 | HOSTLOADLIBES_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs) | 209 | HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs) |
| 210 | HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags) | 210 | HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags) |
| 211 | 211 | ||
| 212 | $(obj)/gconf.o: $(obj)/.gconf-cfg | 212 | $(obj)/gconf.o: $(obj)/.gconf-cfg |