Problems building -current world: safe-ctype.c

Hi.

I'm trying to build the world and it's failing during phase 2.3 trying to
build libiberty.

cc -c -I /usr/src/gnu/usr.bin/cc/cc_tools/../libiberty -O2
-fno-strict-aliasing
-pipe -I. -DIN_GCC -DHAVE_CONFIG_H -DPREFIX=\"/usr\"
-I/usr/obj/usr/src/gnu/usr.
bin/cc/cc_tools/../cc_tools -I/usr/src/gnu/usr.bin/cc/cc_tools/../cc_tools
-I/us
r/src/gnu/usr.bin/cc/cc_tools/../../../../contrib/gcc
-I/usr/src/gnu/usr.bin/cc/
cc_tools/../../../../contrib/gcc/config
-I/usr/src/gnu/usr.bin/cc/cc_tools/../..
/../../contrib/gcclibs/include
-I/usr/src/gnu/usr.bin/cc/cc_tools/../../../../co
ntrib/gcclibs/libcpp/include
-I/usr/src/gnu/usr.bin/cc/cc_tools/../../../../cont
rib/gcclibs/libdecnumber -g -DGENERATOR_FILE -DHAVE_CONFIG_H
-I/usr/obj/usr/src
/tmp/legacy/usr/include -o safe-ctype.o
/usr/src/gnu/usr.bin/cc/cc_tools/../../.
./../contrib/gcclibs/libiberty/safe-ctype.c
/usr/src/gnu/usr.bin/cc/cc_tools/../../../../contrib/gcclibs/libiberty/safe-ctyp
e.c:161: error: `_sch_isnvsp' undeclared here (not in a function)
/usr/src/gnu/usr.bin/cc/cc_tools/../../../../contrib/gcclibs/libiberty/safe-ctyp
e.c:161: error: `_sch_iscntrl' undeclared here (not in a function)
/usr/src/gnu/usr.bin/cc/cc_tools/../../../../contrib/gcclibs/libiberty/safe-ctyp
e.c:161: error: initializer element is not constant


And so on and so on.

Anybody have any idea what's going wrong?

The system currently is 6.2-RELEASE. I guess I'm going to try taking it to
RELENG_6 before giving up for now, but I'm dubious that that's going to
change anything significant.