• Naohiro Aota's avatar
    x86/vdso: Fix flip/flop vdso build bug · e9a1379f
    Naohiro Aota authored
    Two consecutive "make" on an already compiled kernel tree will show
    different behavior:
    
    $ make
      CALL    scripts/checksyscalls.sh
      CALL    scripts/atomic/check-atomics.sh
      DESCEND  objtool
      CHK     include/generated/compile.h
      VDSOCHK arch/x86/entry/vdso/vdso64.so.dbg
      VDSOCHK arch/x86/entry/vdso/vdso32.so.dbg
    Kernel: arch/x86/boot/bzImage is ready  (#3)
      Building modules, stage 2.
      MODPOST 12 modules
    
    $ make
    make
      CALL    scripts/checksyscalls.sh
      CALL    scripts/atomic/check-atomics.sh
      DESCEND  objtool
      CHK     include/generated/compile.h
      VDSO    arch/x86/entry/vdso/vdso64.so.dbg
      OBJCOPY arch/x86/entry/vdso/vdso64.so
      VDSO2C  arch/x86/entry/vdso/vdso-image-64.c
      CC      arch/x86/entry/vdso/vdso-image-64.o
      VDSO    arch/x86/entry/vdso/vdso32.so.dbg
      OBJCOPY arch/x86/entry/vdso/vdso32.so
      VDSO2C  arch/x86/entry/vdso/vdso-image-32.c
      CC      arch/x86/entry/vdso/vdso-image-32.o
      AR      arch/x86/entry/vdso/built-in.a
      AR      arch/x86/entry/built-in.a
      AR      arch/x86/built-in.a
      GEN     .version
      CHK     include/generated/compile.h
      UPD     include/generated/compile.h
      CC      init/version.o
      AR      init/built-in.a
      LD      vmlinux.o
    <snip>
    
    This is causing "LD vmlinux" once every two times even without any
    modifications. This is the same bug fixed in commit 92a47286
    ("x86/boot: Fix if_changed build flip/flop bug"). Two "if_changed" cannot
    be used in one target.
    
    Fix this merging two commands into one function.
    
    Fixes: 7ac87074 ("x86/vdso: Switch to generic vDSO implementation")
    Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
    Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
    Tested-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
    Reviewed-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
    Reviewed-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
    Link: https://lkml.kernel.org/r/20190712101556.17833-1-naohiro.aota@wdc.com
    e9a1379f
Makefile 6.62 KB