Re: [PATCH v2] nds32: Fix build error caused by configuration flag rename

From: Greentime Hu
Date: Fri Jun 15 2018 - 02:13:42 EST

James Hogan <jhogan@xxxxxxxxxx> æ 2018å6æ14æ éå äå10:29åéï
> From: Guenter Roeck <linux@xxxxxxxxxxxx>
> Fix build error on nds32 due to the merge of commit e3d5980568f ("lib:
> Rename compiler intrinsic selects to GENERIC_LIB_*") during the 4.18
> merge window which renames Kconfig symbols. This had raced with commit
> aeaa7af744fa ("nds32: lib: To use generic lib instead of libgcc to
> prevent the symbol undefined issue.") merged late in the 4.17 cycle,
> which added selects to nds32 using the original Kconfig symbol names.
> When they came together in merge commit 763f96944c95 ("Merge tag
> 'mips_4.18' of
> git://") this resulted
> in the following build errors:
> nds32le-linux-ld: kernel/time/timekeeping.o: in function `timekeeping_init':
> timekeeping.c:(.init.text+0x140): undefined reference to `__ashldi3'
> nds32le-linux-ld: timekeeping.c:(.init.text+0x144): undefined reference to `__ashldi3'
> nds32le-linux-ld: timekeeping.c:(.init.text+0x17e): undefined reference to `__lshrdi3'
> nds32le-linux-ld: timekeeping.c:(.init.text+0x182): undefined reference to `__lshrdi3'
> nds32le-linux-ld: drivers/clocksource/mmio.o: in function `clocksource_mmio_init':
> mmio.c:(.init.text+0x54): undefined reference to `__lshrdi3'
> nds32le-linux-ld: mmio.c:(.init.text+0x58): undefined reference to `__lshrdi3'
> Rename all 6 selects in nds32 and adjust the ordering accordingly to be
> alphabetical.
> Fixes: 763f96944c95 ("Merge tag 'mips_4.18' of git://")
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> [jhogan@xxxxxxxxxx: Rename all 6 symbols, sort, update commit message]
> Signed-off-by: James Hogan <jhogan@xxxxxxxxxx>
> Cc: Greentime Hu <>
> Cc: Vincent Chen <deanbo422@xxxxxxxxx>
> Cc: Matt Redfearn <matt.redfearn@xxxxxxxx>
> Cc: Palmer Dabbelt <palmer@xxxxxxxxxx>
> ---
> Changes in v2:
> - Rename all 6 symbols, not just the 3 that caused build failures.
> - Sort selects.
> - Update commit message.

Thank you James and Guenter.
Should I pick it in my tree? It will be ok to put in your tree. :)

Acked-by: Greentime Hu <greentime@xxxxxxxxxxxxx>