Re: CFT: ndis(4) testers needed!

I did the update a little before your last message.

svn revert

by itself doesn't work, I get an error message, then run

svn help revert

and that gets me on the right track.

I did the update and patch from NetBSD, which I believe works the same as it would from FreeBSD, subsequently booted into FreeBSD and cd /usr/src

make buildworld worked again with no error, but make kernel failed.

Error occurs somewhere in iwi or iwm, and that prevents the kernel from building, so I don't get to test ndis, but it may point to what needs fixing.

Would it be safe to comment out iwi and other Intel wireless nics in kernel config and then try again to make buildkernel without rerunning buildworld?

Or should I wait for next update?  But you probably want to know where the snags are even if they don't relate to my hardware.

End of the buildkernel.log:

===> iwi (all)
cc  -O2 -pipe  -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/SANDY11NC/opt_global.h -I. -I/usr/src/sys -fno-common -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/obj/usr/src/sys/SANDY11NC  -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__  -Wmissing-include-dirs -fdiagnostics-show-option  -Wno-unknown-pragmas  -Wno-error-tautological-compare -Wno-error-empty-body  -Wno-error-parentheses-equality -Wno-error-unused-function  -Wno-error-pointer-sign  -mno-aes -mno-avx  -std=iso9899:1999 -c /usr/src/sys/modules/iwi/../../dev/iwi/if_iwi.c -o if_iwi.o
ctfconvert -L VERSION -g if_iwi.o
ld -d -warn-common -r -d -o if_iwi.ko.debug if_iwi.o
ctfmerge -L VERSION -g -o if_iwi.ko.debug if_iwi.o
:> export_syms
awk -f /usr/src/sys/conf/kmod_syms.awk if_iwi.ko.debug  export_syms | xargs -J% objcopy % if_iwi.ko.debug
objcopy --only-keep-debug if_iwi.ko.debug if_iwi.ko.symbols
objcopy --strip-debug --add-gnu-debuglink=if_iwi.ko.symbols if_iwi.ko.debug if_iwi.ko
===> iwifw (all)
===> iwifw/iwi_bss (all)
uudecode -p /usr/src/sys/modules/iwifw/iwi_bss/../../../contrib/dev/iwi/ipw2200-bss.fw.uu > iwi_bss
iwi_bss iwi_bss
cc  -O2 -pipe  -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/SANDY11NC/opt_global.h -I. -I/usr/src/sys -fno-common -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/obj/usr/src/sys/SANDY11NC  -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__  -Wmissing-include-dirs -fdiagnostics-show-option  -Wno-unknown-pragmas  -Wno-error-tautological-compare -Wno-error-empty-body  -Wno-error-parentheses-equality -Wno-error-unused-function  -Wno-error-pointer-sign  -mno-aes -mno-avx  -std=iso9899:1999 -c iwi_bss.c -o iwi_bss.o
ctfconvert -L VERSION -g iwi_bss.o
ld -d -warn-common -r -d -o iwi_bss.ko.debug iwi_bss.fwo iwi_bss.o
ctfmerge -L VERSION -g -o iwi_bss.ko.debug iwi_bss.fwo iwi_bss.o
:> export_syms
awk -f /usr/src/sys/conf/kmod_syms.awk iwi_bss.ko.debug  export_syms | xargs -J% objcopy % iwi_bss.ko.debug
objcopy --only-keep-debug iwi_bss.ko.debug iwi_bss.ko.symbols
objcopy --strip-debug --add-gnu-debuglink=iwi_bss.ko.symbols iwi_bss.ko.debug iwi_bss.ko
===> iwifw/iwi_ibss (all)
uudecode -p /usr/src/sys/modules/iwifw/iwi_ibss/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu > iwi_ibss
iwi_ibss iwi_ibss
cc  -O2 -pipe  -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/SANDY11NC/opt_global.h -I. -I/usr/src/sys -fno-common -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/obj/usr/src/sys/SANDY11NC  -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__  -Wmissing-include-dirs -fdiagnostics-show-option  -Wno-unknown-pragmas  -Wno-error-tautological-compare -Wno-error-empty-body  -Wno-error-parentheses-equality -Wno-error-unused-function  -Wno-error-pointer-sign  -mno-aes -mno-avx  -std=iso9899:1999 -c iwi_ibss.c -o iwi_ibss.o
ctfconvert -L VERSION -g iwi_ibss.o
ld -d -warn-common -r -d -o iwi_ibss.ko.debug iwi_ibss.fwo iwi_ibss.o
ctfmerge -L VERSION -g -o iwi_ibss.ko.debug iwi_ibss.fwo iwi_ibss.o
:> export_syms
awk -f /usr/src/sys/conf/kmod_syms.awk iwi_ibss.ko.debug  export_syms | xargs -J% objcopy % iwi_ibss.ko.debug
objcopy --only-keep-debug iwi_ibss.ko.debug iwi_ibss.ko.symbols
objcopy --strip-debug --add-gnu-debuglink=iwi_ibss.ko.symbols iwi_ibss.ko.debug iwi_ibss.ko
===> iwifw/iwi_monitor (all)
uudecode -p /usr/src/sys/modules/iwifw/iwi_monitor/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu > iwi_monitor
iwi_monitor iwi_monitor
cc  -O2 -pipe  -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/SANDY11NC/opt_global.h -I. -I/usr/src/sys -fno-common -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/obj/usr/src/sys/SANDY11NC  -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__  -Wmissing-include-dirs -fdiagnostics-show-option  -Wno-unknown-pragmas  -Wno-error-tautological-compare -Wno-error-empty-body  -Wno-error-parentheses-equality -Wno-error-unused-function  -Wno-error-pointer-sign  -mno-aes -mno-avx  -std=iso9899:1999 -c iwi_monitor.c -o iwi_monitor.o
ctfconvert -L VERSION -g iwi_monitor.o
ld -d -warn-common -r -d -o iwi_monitor.ko.debug iwi_monitor.fwo iwi_monitor.o
ctfmerge -L VERSION -g -o iwi_monitor.ko.debug iwi_monitor.fwo iwi_monitor.o
:> export_syms
awk -f /usr/src/sys/conf/kmod_syms.awk iwi_monitor.ko.debug  export_syms | xargs -J% objcopy % iwi_monitor.ko.debug
objcopy --only-keep-debug iwi_monitor.ko.debug iwi_monitor.ko.symbols
objcopy --strip-debug --add-gnu-debuglink=iwi_monitor.ko.symbols iwi_monitor.ko.debug iwi_monitor.ko
===> iwm (all)
cc  -O2 -pipe  -DIWM_DEBUG -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/SANDY11NC/opt_global.h -I. -I/usr/src/sys -fno-common -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/obj/usr/src/sys/SANDY11NC  -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__  -Wmissing-include-dirs -fdiagnostics-show-option  -Wno-unknown-pragmas  -Wno-error-tautological-compare -Wno-error-empty-body  -Wno-error-parentheses-equality -Wno-error-unused-function  -Wno-error-pointer-sign  -mno-aes -mno-avx  -std=iso9899:1999 -c /usr/src/sys/modules/iwm/../../dev/iwm/if_iwm.c -o if_iwm.o
/usr/src/sys/modules/iwm/../../dev/iwm/if_iwm.c:3843:10: error: use of undeclared identifier 'ifp'; did you mean 'if'?
        KASSERT(ifp->if_drv_flags & IFF_DRV_RUNNING, ("not running"));
                ^~~
                if
/usr/src/sys/sys/systm.h:84:24: note: expanded from macro 'KASSERT'
        if (__predict_false(!(exp)))                                    \
                              ^
/usr/src/sys/sys/cdefs.h:456:51: note: expanded from macro '__predict_false'
#define __predict_false(exp)    __builtin_expect((exp), 0)
                                                  ^
/usr/src/sys/modules/iwm/../../dev/iwm/if_iwm.c:3843:10: error: expected expression
/usr/src/sys/sys/systm.h:84:24: note: expanded from macro 'KASSERT'
        if (__predict_false(!(exp)))                                    \
                              ^
/usr/src/sys/sys/cdefs.h:456:51: note: expanded from macro '__predict_false'
#define __predict_false(exp)    __builtin_expect((exp), 0)
                                                  ^
2 errors generated.
*** Error code 1

Stop.
make[4]: stopped in /usr/src/sys/modules/iwm
*** Error code 1

Stop.
make[3]: stopped in /usr/src/sys/modules
*** Error code 1

Stop.
make[2]: stopped in /usr/obj/usr/src/sys/SANDY11NC
*** Error code 1

Stop.
make[1]: stopped in /usr/src
*** Error code 1

Stop.
make: stopped in /usr/src

Tom