| Message ID | 20180707010709.16648-7-labbott@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2018-07-07 10:07 GMT+09:00 Laura Abbott <labbott@redhat.com>: > In preparation for enabling command line LDLIBS, re-name HOST_LOADLIBES to > KBUILD_HOSTLDLIBS as the internal use only flags. This should not have any > visible effects. > > Signed-off-by: Laura Abbott <labbott@redhat.com> > --- > Makefile | 4 ++-- > samples/bpf/Makefile | 2 +- > scripts/Makefile.host | 10 +++++----- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/Makefile b/Makefile > index 319736b80016..d925af1fb11b 100644 > --- a/Makefile > +++ b/Makefile > @@ -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 > > diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile > index 09f90955412e..c20fb2fa9c37 100644 > --- a/samples/bpf/Makefile > +++ b/samples/bpf/Makefile > @@ -180,7 +180,7 @@ KBUILD_HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/ > KBUILD_HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/ > KBUILD_HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/ > > -HOST_LOADLIBES += $(LIBBPF) -lelf > +KBUILD_HOSTLDLIBS += $(LIBBPF) -lelf > HOSTLOADLIBES_tracex4 += -lrt > HOSTLOADLIBES_trace_output += -lrt > HOSTLOADLIBES_map_perf_test += -lrt > diff --git a/scripts/Makefile.host b/scripts/Makefile.host > index 07acf5779f55..7b784413d921 100644 > --- a/scripts/Makefile.host > +++ b/scripts/Makefile.host > @@ -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) $(HOSTLOADLIBES_$(@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) $(HOSTLOADLIBES_$(@F)) For consistency, please rename $(HOSTLOADLIBES_$(@F)) to $(HOSTLDLIBS_$(@F))
diff --git a/Makefile b/Makefile index 319736b80016..d925af1fb11b 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 09f90955412e..c20fb2fa9c37 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -180,7 +180,7 @@ KBUILD_HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/ KBUILD_HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/ KBUILD_HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/ -HOST_LOADLIBES += $(LIBBPF) -lelf +KBUILD_HOSTLDLIBS += $(LIBBPF) -lelf HOSTLOADLIBES_tracex4 += -lrt HOSTLOADLIBES_trace_output += -lrt HOSTLOADLIBES_map_perf_test += -lrt diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 07acf5779f55..7b784413d921 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -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) $(HOSTLOADLIBES_$(@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) $(HOSTLOADLIBES_$(@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) $(HOSTLOADLIBES_$(@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) $(HOSTLOADLIBES_$(@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) $(HOSTLOADLIBES_$(@F)) $(host-cxxshlib): FORCE $(call if_changed,host-cxxshlib) $(call multi_depend, $(host-cxxshlib), .so, -objs)
In preparation for enabling command line LDLIBS, re-name HOST_LOADLIBES to KBUILD_HOSTLDLIBS as the internal use only flags. This should not have any visible effects. Signed-off-by: Laura Abbott <labbott@redhat.com> --- Makefile | 4 ++-- samples/bpf/Makefile | 2 +- scripts/Makefile.host | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-)