Fix for kern/51772 breaks linking multi-config kernels?

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

Since this commit:

  http://mail-index.netbsd.org/source-changes/2017/01/04/msg080495.html

My custom kernel with multiple "config" statments:

include         "arch/evbmips/conf/LOONGSON"
[...]
no config       netbsd
config          netbsd_nfs      root on ? type nfs dumps on wd0j
config          netbsd_sd0      root on sd0a type ffs dumps on wd0j
config          netbsd_sd1      root on sd1a type ffs
[...]

fails linking with:

[...]
#      link  YEELOONG/netbsd_nfs
/d0/build/current/tools/amd64/bin/mips64el--netbsd-ld -Map netbsd_nfs.map --cref -m elf64ltsmip -T netbsd_nfs.ldscript -Ttext 0xFFFFFFFF80200000 -e start -G 0 -X -o netbsd_nfs ${SYSTEM_OBJ:N*swap*netbsd_nfs*} ${EXTRA_OBJ} vers.o swapnetbsd_nfs.o
swapnetbsd_sd1.o:(.data+0x0): multiple definition of `rootfstype'
swapnetbsd_sd0.o:(.data+0x0): first defined here
swapnetbsd_sd1.o:(.data+0x8): multiple definition of `dumpdev'
swapnetbsd_sd0.o:(.data+0x8): first defined here
swapnetbsd_sd1.o:(.data+0x10): multiple definition of `dumpspec'
swapnetbsd_sd0.o:(.data+0x10): first defined here
swapnetbsd_sd1.o:(.data+0x18): multiple definition of `rootdev'
swapnetbsd_sd0.o:(.data+0x18): first defined here
swapnetbsd_sd1.o:(.data+0x20): multiple definition of `rootspec'
swapnetbsd_sd0.o:(.data+0x20): first defined here
swapnetbsd_nfs.o:(.data+0x0): multiple definition of `rootfstype'
swapnetbsd_sd0.o:(.data+0x0): first defined here
swapnetbsd_nfs.o:(.data+0x8): multiple definition of `dumpdev'
swapnetbsd_sd0.o:(.data+0x8): first defined here
swapnetbsd_nfs.o:(.data+0x10): multiple definition of `dumpspec'
swapnetbsd_sd0.o:(.data+0x10): first defined here
swapnetbsd_nfs.o:(.data+0x18): multiple definition of `rootdev'
swapnetbsd_sd0.o:(.data+0x18): first defined here
swapnetbsd_nfs.o:(.data+0x20): multiple definition of `rootspec'
swapnetbsd_sd0.o:(.data+0x20): first defined here
/d0/build/current/tools/amd64/bin/mips64el--netbsd-ld: Warning: netbsd_nfs uses -msoft-float (set by locore.o), mips_fpu.o uses -mhard-float
/d0/build/current/tools/amd64/bin/mips64el--netbsd-ld: Warning: netbsd_nfs uses -msoft-float (set by locore.o), fp.o uses -mhard-float
*** [netbsd_nfs] Error code 1

nbmake: stopped in /d0/build/current/obj/mips64el/sys/arch/evbmips/compile/YEELOONG
1 error

nbmake: stopped in /d0/build/current/obj/mips64el/sys/arch/evbmips/compile/YEELOONG

ERROR: Failed to make all in "/d0/build/current/obj/mips64el/sys/arch/evbmips/compile/YEELOONG"
*** BUILD ABORTED ***


Perhaps this is an update-build issue?  I'll wipe my ".../compile"
directory and try again.

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]mylinuxisp[flyspeck]com    OpenBSD            FreeBSD
| X  No HTML/proprietary data in email.   BSD just sits there and works!
|/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645