James Hogan <[email protected]> 於 2018年6月14日 週四 下午10:29寫道： > > From: Guenter Roeck <[email protected]> > > 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://git.kernel.org/pub/scm/linux/kernel/git/mips/linux") 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://git.kernel.org/pub/scm/linux/kernel/git/mips/linux") > Signed-off-by: Guenter Roeck <[email protected]> > [[email protected]: Rename all 6 symbols, sort, update commit message] > Signed-off-by: James Hogan <[email protected]> > Cc: Greentime Hu <[email protected]> > Cc: Vincent Chen <[email protected]> > Cc: Matt Redfearn <[email protected]> > Cc: Palmer Dabbelt <[email protected]> > --- > 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 <[email protected]>
