|
 |
edd5e61 |
From b7e46c634a6a8b5a40369b70f1f6e0bf21fd8c22 Mon Sep 17 00:00:00 2001
|
|
|
edd5e61 |
From: Laura Abbott <labbott@redhat.com>
|
|
|
edd5e61 |
Date: Thu, 5 Jul 2018 15:01:07 -0700
|
|
|
edd5e61 |
Subject: [PATCH] treewide: Rename HOST_LOADLIBES to KBUILD_HOSTLDLIBS
|
|
|
edd5e61 |
|
|
|
edd5e61 |
In preparation for enabling command line LDLIBS, re-name HOST_LOADLIBES to
|
|
|
edd5e61 |
KBUILD_HOSTLDLIBS as the internal use only flags. Also rename existing usage
|
|
|
edd5e61 |
to HOSTLDLIBS for consistency. This should not have any visible effects.
|
|
|
edd5e61 |
|
|
|
edd5e61 |
Signed-off-by: Laura Abbott <labbott@redhat.com>
|
|
|
edd5e61 |
---
|
|
|
edd5e61 |
Makefile | 4 ++--
|
|
|
edd5e61 |
samples/bpf/Makefile | 12 ++++++------
|
|
|
edd5e61 |
samples/seccomp/Makefile | 6 +++---
|
|
|
edd5e61 |
scripts/Makefile | 4 ++--
|
|
|
edd5e61 |
scripts/Makefile.host | 10 +++++-----
|
|
|
edd5e61 |
scripts/kconfig/Makefile | 8 ++++----
|
|
|
edd5e61 |
6 files changed, 22 insertions(+), 22 deletions(-)
|
|
|
edd5e61 |
|
|
|
edd5e61 |
diff --git a/Makefile b/Makefile
|
|
|
edd5e61 |
index bd2d64b89463..96e34381d9ee 100644
|
|
|
edd5e61 |
--- a/Makefile
|
|
|
edd5e61 |
+++ b/Makefile
|
|
|
edd5e61 |
@@ -363,7 +363,7 @@ KBUILD_HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \
|
|
|
edd5e61 |
-fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS)
|
|
|
edd5e61 |
KBUILD_HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS)
|
|
|
edd5e61 |
KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAGS)
|
|
|
edd5e61 |
-HOST_LOADLIBES := $(HOST_LFS_LIBS)
|
|
|
edd5e61 |
+KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS)
|
|
|
edd5e61 |
|
|
|
edd5e61 |
# Make variables (CC, etc...)
|
|
|
edd5e61 |
AS = $(CROSS_COMPILE)as
|
|
|
edd5e61 |
@@ -430,7 +430,7 @@ LDFLAGS :=
|
|
|
edd5e61 |
GCC_PLUGINS_CFLAGS :=
|
|
|
edd5e61 |
|
|
|
edd5e61 |
export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
|
|
|
edd5e61 |
-export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS HOST_LOADLIBES
|
|
|
edd5e61 |
+export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS
|
|
|
edd5e61 |
export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
|
|
|
edd5e61 |
export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
|
|
|
edd5e61 |
|
|
|
edd5e61 |
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
|
|
|
edd5e61 |
index 494ef04c56cc..bd9f6c2a808e 100644
|
|
|
edd5e61 |
--- a/samples/bpf/Makefile
|
|
|
edd5e61 |
+++ b/samples/bpf/Makefile
|
|
|
edd5e61 |
@@ -180,12 +180,12 @@ HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/
|
|
|
edd5e61 |
HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/
|
|
|
edd5e61 |
HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/
|
|
|
edd5e61 |
|
|
|
edd5e61 |
-HOST_LOADLIBES += $(LIBBPF) -lelf
|
|
|
edd5e61 |
-HOSTLOADLIBES_tracex4 += -lrt
|
|
|
edd5e61 |
-HOSTLOADLIBES_trace_output += -lrt
|
|
|
edd5e61 |
-HOSTLOADLIBES_map_perf_test += -lrt
|
|
|
edd5e61 |
-HOSTLOADLIBES_test_overhead += -lrt
|
|
|
edd5e61 |
-HOSTLOADLIBES_xdpsock += -pthread
|
|
|
edd5e61 |
+KBUILD_HOSTLDLIBS += $(LIBBPF) -lelf
|
|
|
edd5e61 |
+HOSTLDLIBS_tracex4 += -lrt
|
|
|
edd5e61 |
+HOSTLDLIBS_trace_output += -lrt
|
|
|
edd5e61 |
+HOSTLDLIBS_map_perf_test += -lrt
|
|
|
edd5e61 |
+HOSTLDLIBS_test_overhead += -lrt
|
|
|
edd5e61 |
+HOSTLDLIBS_xdpsock += -pthread
|
|
|
edd5e61 |
|
|
|
edd5e61 |
# Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline:
|
|
|
edd5e61 |
# make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang
|
|
|
edd5e61 |
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile
|
|
|
edd5e61 |
index ba942e3ead89..cf34ff6b4065 100644
|
|
|
edd5e61 |
--- a/samples/seccomp/Makefile
|
|
|
edd5e61 |
+++ b/samples/seccomp/Makefile
|
|
|
edd5e61 |
@@ -30,9 +30,9 @@ HOSTCFLAGS_bpf-direct.o += $(MFLAG)
|
|
|
edd5e61 |
HOSTCFLAGS_dropper.o += $(MFLAG)
|
|
|
edd5e61 |
HOSTCFLAGS_bpf-helper.o += $(MFLAG)
|
|
|
edd5e61 |
HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
|
|
|
edd5e61 |
-HOSTLOADLIBES_bpf-direct += $(MFLAG)
|
|
|
edd5e61 |
-HOSTLOADLIBES_bpf-fancy += $(MFLAG)
|
|
|
edd5e61 |
-HOSTLOADLIBES_dropper += $(MFLAG)
|
|
|
edd5e61 |
+HOSTLDLIBS_bpf-direct += $(MFLAG)
|
|
|
edd5e61 |
+HOSTLDLIBS_bpf-fancy += $(MFLAG)
|
|
|
edd5e61 |
+HOSTLDLIBS_dropper += $(MFLAG)
|
|
|
edd5e61 |
endif
|
|
|
edd5e61 |
always := $(hostprogs-m)
|
|
|
edd5e61 |
endif
|
|
|
edd5e61 |
diff --git a/scripts/Makefile b/scripts/Makefile
|
|
|
edd5e61 |
index 25ab143cbe14..166b94db90e3 100644
|
|
|
edd5e61 |
--- a/scripts/Makefile
|
|
|
edd5e61 |
+++ b/scripts/Makefile
|
|
|
edd5e61 |
@@ -22,8 +22,8 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
|
|
|
edd5e61 |
|
|
|
edd5e61 |
HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
|
|
|
edd5e61 |
HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
|
|
|
edd5e61 |
-HOSTLOADLIBES_sign-file = -lcrypto
|
|
|
edd5e61 |
-HOSTLOADLIBES_extract-cert = -lcrypto
|
|
|
edd5e61 |
+HOSTLDLIBS_sign-file = -lcrypto
|
|
|
edd5e61 |
+HOSTLDLIBS_extract-cert = -lcrypto
|
|
|
edd5e61 |
|
|
|
edd5e61 |
always := $(hostprogs-y) $(hostprogs-m)
|
|
|
edd5e61 |
|
|
|
edd5e61 |
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
|
|
|
edd5e61 |
index c019d781b2c9..0393f75db4d4 100644
|
|
|
edd5e61 |
--- a/scripts/Makefile.host
|
|
|
edd5e61 |
+++ b/scripts/Makefile.host
|
|
|
edd5e61 |
@@ -85,7 +85,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags)
|
|
|
edd5e61 |
# host-csingle -> Executable
|
|
|
edd5e61 |
quiet_cmd_host-csingle = HOSTCC $@
|
|
|
edd5e61 |
cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \
|
|
|
edd5e61 |
- $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
|
|
edd5e61 |
+ $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
|
|
edd5e61 |
$(host-csingle): $(obj)/%: $(src)/%.c FORCE
|
|
|
edd5e61 |
$(call if_changed_dep,host-csingle)
|
|
|
edd5e61 |
|
|
|
edd5e61 |
@@ -94,7 +94,7 @@ $(host-csingle): $(obj)/%: $(src)/%.c FORCE
|
|
|
edd5e61 |
quiet_cmd_host-cmulti = HOSTLD $@
|
|
|
edd5e61 |
cmd_host-cmulti = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \
|
|
|
edd5e61 |
$(addprefix $(obj)/,$($(@F)-objs)) \
|
|
|
edd5e61 |
- $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
|
|
edd5e61 |
+ $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
|
|
edd5e61 |
$(host-cmulti): FORCE
|
|
|
edd5e61 |
$(call if_changed,host-cmulti)
|
|
|
edd5e61 |
$(call multi_depend, $(host-cmulti), , -objs)
|
|
|
edd5e61 |
@@ -112,7 +112,7 @@ quiet_cmd_host-cxxmulti = HOSTLD $@
|
|
|
edd5e61 |
cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \
|
|
|
edd5e61 |
$(foreach o,objs cxxobjs,\
|
|
|
edd5e61 |
$(addprefix $(obj)/,$($(@F)-$(o)))) \
|
|
|
edd5e61 |
- $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
|
|
edd5e61 |
+ $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
|
|
edd5e61 |
$(host-cxxmulti): FORCE
|
|
|
edd5e61 |
$(call if_changed,host-cxxmulti)
|
|
|
edd5e61 |
$(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs)
|
|
|
edd5e61 |
@@ -145,7 +145,7 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
|
|
|
edd5e61 |
quiet_cmd_host-cshlib = HOSTLLD -shared $@
|
|
|
edd5e61 |
cmd_host-cshlib = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
|
|
|
edd5e61 |
$(addprefix $(obj)/,$($(@F:.so=-objs))) \
|
|
|
edd5e61 |
- $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
|
|
edd5e61 |
+ $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
|
|
edd5e61 |
$(host-cshlib): FORCE
|
|
|
edd5e61 |
$(call if_changed,host-cshlib)
|
|
|
edd5e61 |
$(call multi_depend, $(host-cshlib), .so, -objs)
|
|
|
edd5e61 |
@@ -155,7 +155,7 @@ $(call multi_depend, $(host-cshlib), .so, -objs)
|
|
|
edd5e61 |
quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
|
|
|
edd5e61 |
cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
|
|
|
edd5e61 |
$(addprefix $(obj)/,$($(@F:.so=-objs))) \
|
|
|
edd5e61 |
- $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
|
|
|
edd5e61 |
+ $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
|
|
|
edd5e61 |
$(host-cxxshlib): FORCE
|
|
|
edd5e61 |
$(call if_changed,host-cxxshlib)
|
|
|
edd5e61 |
$(call multi_depend, $(host-cxxshlib), .so, -objs)
|
|
|
edd5e61 |
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
|
|
edd5e61 |
index a3ac2c91331c..8f283acdaa4d 100644
|
|
|
edd5e61 |
--- a/scripts/kconfig/Makefile
|
|
|
edd5e61 |
+++ b/scripts/kconfig/Makefile
|
|
|
edd5e61 |
@@ -169,7 +169,7 @@ HOSTCFLAGS_zconf.tab.o := -I$(src)
|
|
|
edd5e61 |
hostprogs-y += nconf
|
|
|
edd5e61 |
nconf-objs := nconf.o zconf.tab.o nconf.gui.o
|
|
|
edd5e61 |
|
|
|
edd5e61 |
-HOSTLOADLIBES_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs)
|
|
|
edd5e61 |
+HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs)
|
|
|
edd5e61 |
HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
|
|
|
edd5e61 |
HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
|
|
|
edd5e61 |
|
|
|
edd5e61 |
@@ -180,7 +180,7 @@ hostprogs-y += mconf
|
|
|
edd5e61 |
lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
|
|
|
edd5e61 |
mconf-objs := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog))
|
|
|
edd5e61 |
|
|
|
edd5e61 |
-HOSTLOADLIBES_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
|
|
|
edd5e61 |
+HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
|
|
|
edd5e61 |
$(foreach f, mconf.o $(lxdialog), \
|
|
|
edd5e61 |
$(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
|
|
|
edd5e61 |
|
|
|
edd5e61 |
@@ -191,7 +191,7 @@ hostprogs-y += qconf
|
|
|
edd5e61 |
qconf-cxxobjs := qconf.o
|
|
|
edd5e61 |
qconf-objs := zconf.tab.o
|
|
|
edd5e61 |
|
|
|
edd5e61 |
-HOSTLOADLIBES_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
|
|
|
edd5e61 |
+HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
|
|
|
edd5e61 |
HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
|
|
|
edd5e61 |
|
|
|
edd5e61 |
$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
|
|
|
edd5e61 |
@@ -206,7 +206,7 @@ $(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
|
|
|
edd5e61 |
hostprogs-y += gconf
|
|
|
edd5e61 |
gconf-objs := gconf.o zconf.tab.o
|
|
|
edd5e61 |
|
|
|
edd5e61 |
-HOSTLOADLIBES_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
|
|
|
edd5e61 |
+HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
|
|
|
edd5e61 |
HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
|
|
|
edd5e61 |
|
|
|
edd5e61 |
$(obj)/gconf.o: $(obj)/.gconf-cfg
|
|
|
edd5e61 |
--
|
|
|
edd5e61 |
2.17.1
|
|
|
edd5e61 |
|