kern/52206: conflicting types for register_t between system headers & rump

[venture37%geeklan.co.uk@localhost]

>Number:         52206
>Category:       kern
>Synopsis:       conflicting types for register_t between system headers & rump
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon May 01 06:20:00 +0000 2017
>Originator:     Sevan Janiyan
>Release:        NetBSD-head
>Organization:
>Environment:
NetBSD 7.99.70 (GENERIC) #0: Sat Apr 22 21:50:49 UTC 2017  mkrepro%mkrepro.NetBSD.org@localhost:/usr/src/sys/arch/i386/compile/GENERIC i386
>Description:
Running ./buildrump.sh -s /usr/src build to build a rump kernel using the latest src obtained from anoncvs fails with 

--- rumpuser_dl.pico ---
#   compile  librumpuser/rumpuser_dl.pico
/home/sme/rumprun/buildrump.sh/obj/tooldir/bin/i486--netbsdelf-gcc -O2 -g    -std=gnu99    -Wall -Wstrict-proto
types -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare  -Wsystem-headers   -Wno-traditional   -Wa,--fatal-w
arnings  -Wreturn-type -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -Wno-sign-comp
are -Wold-style-definition -Wsign-compare -Wformat=2  -Wno-format-zero-length  -Werror -Wno-format     -DRUMPUSER
_CONFIG=yes -I/home/sme/rumprun/buildrump.sh/obj/tooldir/autoconf -I/home/sme/rumprun/buildrump.sh/obj/tooldi
r/compat/include -I/home/sme/rumprun/buildrump.sh/obj/dest.stage/usr/include  -DLIBRUMPUSER -D_KERNTYPES -D_REE
NTRANT  -c    -fPIC -g /usr/src/lib/librumpuser/rumpuser_dl.c -o rumpuser_dl.pico
In file included from /usr/src/lib/librumpuser/rumpuser_dl.c:40:0:
/usr/src/lib/librumpuser/rumpuser_port.h:303:25: error: conflicting types for 'register_t'
 typedef RUMP_REGISTER_T register_t;
                         ^
In file included from /usr/include/sys/types.h:45:0,
                 from /usr/include/sys/param.h:105,
                 from /usr/src/lib/librumpuser/rumpuser_port.h:87,
                 from /usr/src/lib/librumpuser/rumpuser_dl.c:40:
/usr/include/i386/types.h:93:22: note: previous declaration of 'register_t' was here
 typedef __register_t register_t;
                      ^
*** [rumpuser_dl.pico] Error code 1

nbmake[2]: stopped in /usr/src/lib/librumpuser
--- rumpuser_daemonize.pico ---
 typedef RUMP_REGISTER_T register_t;
                         ^
In file included from /usr/include/sys/types.h:45:0,
                 from /usr/include/sys/param.h:105,
                 from /usr/src/lib/librumpuser/rumpuser_port.h:87,
                 from /usr/src/lib/librumpuser/rumpuser_daemonize.c:28:
/usr/include/i386/types.h:93:22: note: previous declaration of 'register_t' was here
 typedef __register_t register_t;
                      ^
*** [rumpuser_daemonize.pico] Error code 1

nbmake[2]: stopped in /usr/src/lib/librumpuser
--- rumpuser.pico ---
In file included from /usr/src/lib/librumpuser/rumpuser.c:28:0:
/usr/src/lib/librumpuser/rumpuser_port.h:303:25: error: conflicting types for 'register_t'
 typedef RUMP_REGISTER_T register_t;
                         ^
In file included from /usr/include/sys/types.h:45:0,
                 from /usr/include/sys/param.h:105,
                 from /usr/src/lib/librumpuser/rumpuser_port.h:87,
                 from /usr/src/lib/librumpuser/rumpuser.c:28:
/usr/include/i386/types.h:93:22: note: previous declaration of 'register_t' was here
 typedef __register_t register_t;
                      ^
*** [rumpuser.pico] Error code 1

typedef __register_t register_t; appeared in r1.86 of src/sys/arch/i386/include/types.h 

http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/i386/include/types.h?rev=1.86&content-type=text/x-cvsweb-markup&only_with_tag=MAIN


Commenting out this lines allows the build to complete successfully.
>How-To-Repeat:
1) Clone buildrump repo
2) checkout src from anoncvs
3) run ./buildrump.sh -s /usr/src build
>Fix: