lkml.org 
[lkml]   [2020]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] kbuild: mkcompile_h: Include $LD version in /proc/version
    On Fri, Apr 03, 2020 at 02:00:52AM +0900, Masahiro Yamada wrote:
    > Hi Kees,
    >
    > On Thu, Apr 2, 2020 at 5:18 PM Kees Cook <keescook@chromium.org> wrote:
    > >
    > > When doing Clang builds of the kernel, it is possible to link with
    > > either ld.bfd (binutils) or ld.lld (LLVM), but it is not possible to
    > > discover this from a running kernel. Add the "$LD -v" output to
    > > /proc/version.
    > >
    > > Signed-off-by: Kees Cook <keescook@chromium.org>
    > > ---
    > > init/Makefile | 2 +-
    > > scripts/mkcompile_h | 8 ++++++--
    > > 2 files changed, 7 insertions(+), 3 deletions(-)
    > >
    > > diff --git a/init/Makefile b/init/Makefile
    > > index 6246a06364d0..82c15bdb42d7 100644
    > > --- a/init/Makefile
    > > +++ b/init/Makefile
    > > @@ -35,4 +35,4 @@ include/generated/compile.h: FORCE
    > > @$($(quiet)chk_compile.h)
    > > $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
    > > "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \
    > > - "$(CONFIG_PREEMPT_RT)" "$(CC) $(KBUILD_CFLAGS)"
    > > + "$(CONFIG_PREEMPT_RT)" "$(LD)" "$(CC) $(KBUILD_CFLAGS)"
    > > diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
    > > index 3a5a4b210c86..f98c07709370 100755
    > > --- a/scripts/mkcompile_h
    > > +++ b/scripts/mkcompile_h
    > > @@ -6,7 +6,8 @@ ARCH=$2
    > > SMP=$3
    > > PREEMPT=$4
    > > PREEMPT_RT=$5
    > > -CC=$6
    > > +LD=$6
    > > +CC=$7
    >
    >
    > Just a nit.
    >
    > If you just append 'LD',
    > you do not need to touch the 'CC=$6' line.

    Oh! Yes, good point. I had convinced myself that the "CC=$6" was dropping
    all the passed-in KBUILD_CFLAGS, but I failed to notice the double quotes.

    > If you do not mind, I will fold the following
    > on top of your patch.

    Yes, that would be great; thanks!

    -Kees

    >
    >
    >
    >
    > --- a/init/Makefile
    > +++ b/init/Makefile
    > @@ -35,4 +35,4 @@ include/generated/compile.h: FORCE
    > @$($(quiet)chk_compile.h)
    > $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
    > "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \
    > - "$(CONFIG_PREEMPT_RT)" "$(LD)" "$(CC) $(KBUILD_CFLAGS)"
    > + "$(CONFIG_PREEMPT_RT)" "$(CC) $(KBUILD_CFLAGS)" "$(LD)"
    > diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
    > index 8b38a96163e2..5b80a4699740 100755
    > --- a/scripts/mkcompile_h
    > +++ b/scripts/mkcompile_h
    > @@ -6,8 +6,8 @@ ARCH=$2
    > SMP=$3
    > PREEMPT=$4
    > PREEMPT_RT=$5
    > -LD=$6
    > -CC=$7
    > +CC=$6
    > +LD=$7
    >
    >
    >
    >
    >
    >
    > --
    > Best Regards
    > Masahiro Yamada

    --
    Kees Cook

    \
     
     \ /
      Last update: 2020-04-02 19:34    [W:3.627 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site