Messages in this thread | | | Date | Mon, 23 Jul 2007 08:42:35 +0200 | From | Sam Ravnborg <> | Subject | Re: [PATCH] Move --build-id option |
| |
On Sun, Jul 22, 2007 at 11:14:46PM -0700, Roland McGrath wrote: > > My original makefile patch to use ld --build-id wound up using it in too > many places. We want it only for the .ko and vmlinux links (and vmlinux > temporary links that determine the vmlinux layout). > > Signed-off-by: Roland McGrath <roland@redhat.com> > --- > Makefile | 8 +++----- > scripts/Makefile.modpost | 4 ++-- > 2 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/Makefile b/Makefile > index cd47845..fe6c5dd 100644 > --- a/Makefile > +++ b/Makefile > @@ -518,8 +518,6 @@ CFLAGS += $(call cc-option,-Wno-pointer-sign,) > # Use --build-id when available. > LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\ > $(call ld-option, -Wl$(comma)--build-id,)) > -LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID) As noted below keep this line.
> -LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID) This needed to go otherwise you had to rely on all arch makefiles used += for LDFLAGS_vmlinux assignments. > > # Default kernel image to build when no specific target is given. > # KBUILD_IMAGE may be overruled on the command line or > @@ -616,9 +614,9 @@ export KBUILD_VMLINUX_OBJS := $(vmlinux-all) > # Rule to link vmlinux - also used during CONFIG_KALLSYMS > # May be overridden by arch/$(ARCH)/Makefile > quiet_cmd_vmlinux__ ?= LD $@ > - cmd_vmlinux__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) -o $@ \ > - -T $(vmlinux-lds) $(vmlinux-init) \ > - --start-group $(vmlinux-main) --end-group \ > + cmd_vmlinux__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_BUILD_ID) $(LDFLAGS_vmlinux) \ > + -o $@ -T $(vmlinux-lds) $(vmlinux-init) \ > + --start-group $(vmlinux-main) --end-group \ > $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o FORCE ,$^) This is OK. > > # Generate new vmlinux version > diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost > index c6fcc59..a86a3b1 100644 > --- a/scripts/Makefile.modpost > +++ b/scripts/Makefile.modpost > @@ -97,8 +97,8 @@ targets += $(modules:.ko=.mod.o) > > # Step 6), final link of the modules > quiet_cmd_ld_ko_o = LD [M] $@ > - cmd_ld_ko_o = $(LD) $(LDFLAGS) $(LDFLAGS_MODULE) -o $@ \ > - $(filter-out FORCE,$^) > + cmd_ld_ko_o = $(LD) $(LDFLAGS) $(LDFLAGS_BUILD_ID) $(LDFLAGS_MODULE) \ > + -o $@ $(filter-out FORCE,$^)
This will not work as LDFLAGS_BUILD_ID is not exported. Please make the change as outlined in earlier mail so we actually start using LDFALGS_MODULE as documented.
Thanks, Sam - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |