Upgrading 5.4 to 7.0 Error on Kernel

[Tamouh H.]

Hi,

I'm trying to upgrade from 5.4 i386 to 7.0 latest release. But I'm having a bit of problem with the upgrade for some reason.

This is what has been done so far:

- deleted /usr/src/*
- cvsup -g -L 2  to RELENG_7_0  src-all
- deleted /usr/obj/*
- in /usr/src make clean

The error occurs when doing: make kernel-toolchain

===> usr.bin/gencat (obj,depend,all,install)
/usr/obj/usr/src/tmp/usr/src/usr.bin/gencat created for /usr/src/usr.bin/gencat
rm -f .depend
mkdep -f .depend -a    -I/usr/obj/usr/src/tmp/legacy/usr/include /usr/src/usr.bin/gencat/gencat.c
echo gencat: /usr/lib/libc.a /usr/obj/usr/src/tmp/legacy/usr/lib/libegacy.a >> .depend
cc -O2 -fno-strict-aliasing -pipe  -I/usr/obj/usr/src/tmp/legacy/usr/include -c /usr/src/usr.bin/gencat/gencat.c
In file included from /usr/src/usr.bin/gencat/gencat.c:88:
/usr/obj/usr/src/tmp/legacy/usr/include/nl_types.h:100: error: syntax error before "__format_arg"
*** Error code 1

Stop in /usr/src/usr.bin/gencat.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.

Any tips on how to get this update? Or should I move to 6.x then 7.x ?

Thanks,

Tamouh Hakmi