| Message ID | 20190713040110.18210-1-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild: add --hash-style= and --build-id unconditionally | expand |
On Sat, Jul 13, 2019 at 01:01:10PM +0900, Masahiro Yamada wrote: > As commit 1e0221374e30 ("mips: vdso: drop unnecessary cc-ldoption") > explained, these flags are supported by the minimal required version > of binutils. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Also supported by ld.lld; I tested both arm and x86, the build ID shows up fine. Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Tested-by: Nathan Chancellor <natechancellor@gmail.com>
On Sat, Jul 13, 2019 at 1:01 PM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > As commit 1e0221374e30 ("mips: vdso: drop unnecessary cc-ldoption") > explained, these flags are supported by the minimal required version > of binutils. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Applied to linux-kbuild. > > Makefile | 6 ++---- > arch/arm/vdso/Makefile | 3 +-- > arch/arm64/kernel/vdso32/Makefile | 4 ++-- > arch/sparc/vdso/Makefile | 3 +-- > arch/x86/entry/vdso/Makefile | 5 ++--- > 5 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/Makefile b/Makefile > index 2c5d00ba537e..969182105dbd 100644 > --- a/Makefile > +++ b/Makefile > @@ -900,10 +900,8 @@ KBUILD_CPPFLAGS += $(ARCH_CPPFLAGS) $(KCPPFLAGS) > KBUILD_AFLAGS += $(ARCH_AFLAGS) $(KAFLAGS) > KBUILD_CFLAGS += $(ARCH_CFLAGS) $(KCFLAGS) > > -# Use --build-id when available. > -LDFLAGS_BUILD_ID := $(call ld-option, --build-id) > -KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID) > -LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID) > +KBUILD_LDFLAGS_MODULE += --build-id > +LDFLAGS_vmlinux += --build-id > > ifeq ($(CONFIG_STRIP_ASM_SYMS),y) > LDFLAGS_vmlinux += $(call ld-option, -X,) > diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile > index ca85df247775..87b7769214e0 100644 > --- a/arch/arm/vdso/Makefile > +++ b/arch/arm/vdso/Makefile > @@ -13,8 +13,7 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING > ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8 > ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ > -z max-page-size=4096 -nostdlib -shared $(ldflags-y) \ > - $(call ld-option, --hash-style=sysv) \ > - $(call ld-option, --build-id) \ > + --hash-style=sysv --build-id \ > -T > > obj-$(CONFIG_VDSO) += vdso.o > diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile > index 288c14d30b45..60a4c6239712 100644 > --- a/arch/arm64/kernel/vdso32/Makefile > +++ b/arch/arm64/kernel/vdso32/Makefile > @@ -96,8 +96,8 @@ VDSO_LDFLAGS := $(VDSO_CPPFLAGS) > VDSO_LDFLAGS += -Wl,-Bsymbolic -Wl,--no-undefined -Wl,-soname=linux-vdso.so.1 > VDSO_LDFLAGS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 > VDSO_LDFLAGS += -nostdlib -shared -mfloat-abi=soft > -VDSO_LDFLAGS += $(call cc32-ldoption,-Wl$(comma)--hash-style=sysv) > -VDSO_LDFLAGS += $(call cc32-ldoption,-Wl$(comma)--build-id) > +VDSO_LDFLAGS += -Wl,--hash-style=sysv > +VDSO_LDFLAGS += -Wl,--build-id > VDSO_LDFLAGS += $(call cc32-ldoption,-fuse-ld=bfd) > > > diff --git a/arch/sparc/vdso/Makefile b/arch/sparc/vdso/Makefile > index 5a9e4e1f9f81..324a23947585 100644 > --- a/arch/sparc/vdso/Makefile > +++ b/arch/sparc/vdso/Makefile > @@ -115,8 +115,7 @@ quiet_cmd_vdso = VDSO $@ > -T $(filter %.lds,$^) $(filter %.o,$^) && \ > sh $(srctree)/$(src)/checkundef.sh '$(OBJDUMP)' '$@' > > -VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ > - $(call ld-option, --build-id) -Bsymbolic > +VDSO_LDFLAGS = -shared --hash-style=both --build-id -Bsymbolic > GCOV_PROFILE := n > > # > diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile > index 39106111be86..4c234a18638a 100644 > --- a/arch/x86/entry/vdso/Makefile > +++ b/arch/x86/entry/vdso/Makefile > @@ -179,9 +179,8 @@ quiet_cmd_vdso = VDSO $@ > -T $(filter %.lds,$^) $(filter %.o,$^) && \ > sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' > > -VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ > - $(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \ > - -Bsymbolic > +VDSO_LDFLAGS = -shared --hash-style=both --build-id \ > + $(call ld-option, --eh-frame-hdr) -Bsymbolic > GCOV_PROFILE := n > > # > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/Makefile b/Makefile index 2c5d00ba537e..969182105dbd 100644 --- a/Makefile +++ b/Makefile @@ -900,10 +900,8 @@ KBUILD_CPPFLAGS += $(ARCH_CPPFLAGS) $(KCPPFLAGS) KBUILD_AFLAGS += $(ARCH_AFLAGS) $(KAFLAGS) KBUILD_CFLAGS += $(ARCH_CFLAGS) $(KCFLAGS) -# Use --build-id when available. -LDFLAGS_BUILD_ID := $(call ld-option, --build-id) -KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID) -LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID) +KBUILD_LDFLAGS_MODULE += --build-id +LDFLAGS_vmlinux += --build-id ifeq ($(CONFIG_STRIP_ASM_SYMS),y) LDFLAGS_vmlinux += $(call ld-option, -X,) diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile index ca85df247775..87b7769214e0 100644 --- a/arch/arm/vdso/Makefile +++ b/arch/arm/vdso/Makefile @@ -13,8 +13,7 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8 ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ -z max-page-size=4096 -nostdlib -shared $(ldflags-y) \ - $(call ld-option, --hash-style=sysv) \ - $(call ld-option, --build-id) \ + --hash-style=sysv --build-id \ -T obj-$(CONFIG_VDSO) += vdso.o diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 288c14d30b45..60a4c6239712 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -96,8 +96,8 @@ VDSO_LDFLAGS := $(VDSO_CPPFLAGS) VDSO_LDFLAGS += -Wl,-Bsymbolic -Wl,--no-undefined -Wl,-soname=linux-vdso.so.1 VDSO_LDFLAGS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 VDSO_LDFLAGS += -nostdlib -shared -mfloat-abi=soft -VDSO_LDFLAGS += $(call cc32-ldoption,-Wl$(comma)--hash-style=sysv) -VDSO_LDFLAGS += $(call cc32-ldoption,-Wl$(comma)--build-id) +VDSO_LDFLAGS += -Wl,--hash-style=sysv +VDSO_LDFLAGS += -Wl,--build-id VDSO_LDFLAGS += $(call cc32-ldoption,-fuse-ld=bfd) diff --git a/arch/sparc/vdso/Makefile b/arch/sparc/vdso/Makefile index 5a9e4e1f9f81..324a23947585 100644 --- a/arch/sparc/vdso/Makefile +++ b/arch/sparc/vdso/Makefile @@ -115,8 +115,7 @@ quiet_cmd_vdso = VDSO $@ -T $(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(OBJDUMP)' '$@' -VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ - $(call ld-option, --build-id) -Bsymbolic +VDSO_LDFLAGS = -shared --hash-style=both --build-id -Bsymbolic GCOV_PROFILE := n # diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 39106111be86..4c234a18638a 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -179,9 +179,8 @@ quiet_cmd_vdso = VDSO $@ -T $(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' -VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ - $(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \ - -Bsymbolic +VDSO_LDFLAGS = -shared --hash-style=both --build-id \ + $(call ld-option, --eh-frame-hdr) -Bsymbolic GCOV_PROFILE := n #
As commit 1e0221374e30 ("mips: vdso: drop unnecessary cc-ldoption") explained, these flags are supported by the minimal required version of binutils. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Makefile | 6 ++---- arch/arm/vdso/Makefile | 3 +-- arch/arm64/kernel/vdso32/Makefile | 4 ++-- arch/sparc/vdso/Makefile | 3 +-- arch/x86/entry/vdso/Makefile | 5 ++--- 5 files changed, 8 insertions(+), 13 deletions(-)