misc/54182: Cross-building on Linux fails in rb.c

[gson%gson.org@localhost (Andreas Gustafsson)]

>Number:         54182
>Category:       misc
>Synopsis:       Cross-building on Linux fails in rb.c
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    misc-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu May 09 09:45:00 +0000 2019
>Originator:     Andreas Gustafsson
>Release:        NetBSD-current, source date 2019.05.08.19.34.09
>Organization:
>Environment:
System: NetBSD
Architecture: i386
Machine: i386
>Description:

Building NetBSD-current/i386 on a Debian 9 amd64 host fails with:

/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/../../common/lib/libc/gen/rb.c:44:9: error: expected declaration specifiers or '...' before string constant
 __RCSID("$NetBSD: rb.c,v 1.13 2014/08/22 17:19:48 matt Exp $");
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- reallocarr.lo ---
--- rb.lo ---
/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/../../common/lib/libc/gen/rb.c: In function 'rb_tree_insert_node':
/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/../../common/lib/libc/gen/rb.c:208:7: warning: implicit declaration of function '__predict_false' [-Wimplicit-function-declaration]
   if (__predict_false(diff == 0)) {
       ^~~~~~~~~~~~~~~
/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/../../common/lib/libc/gen/rb.c: At top level:
/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/../../common/lib/libc/gen/rb.c:324:37: error: expected ')' before 'struct'
 rb_tree_reparent_nodes(__rbt_unused struct rb_tree *rbt,
                                     ^~~~~~
/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/../../common/lib/libc/gen/rb.c: In function 'rb_tree_insert_rebalance':
--- reallocarr.lo ---
#   compile  compat/reallocarr.lo
cc -O   -I. -I./include -I/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat -I/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/sys  -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 -D__DBINTERFACE_PRIVATE -c -o reallocarr.lo.o    /bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/../../lib/libc/stdlib/reallocarr.c
--- rb.lo ---
/bracket/build/2019.05.08.19.34.09-i386/src/tools/compat/../../common/lib/libc/gen/rb.c:465:3: warning: implicit declaration of function 'rb_tree_reparent_nodes' [-Wimplicit-function-declaration]
   rb_tree_reparent_nodes(rbt, father, other);
   ^~~~~~~~~~~~~~~~~~~~~~
*** [rb.lo] Error code 1

nbmake[7]: stopped in /bracket/build/2019.05.08.19.34.09-i386/src/tools/compat

Full log at:

  http://www.gson.org/netbsd/bugs/build/i386-linuxhost/commits-2019.05.html#2019.05.08.19.34.09

Might be related to this commit:

  2019.05.08.02.25.50 thorpej src/common/lib/libprop/prop_bool.c 1.18
  2019.05.08.02.25.50 thorpej src/common/lib/libprop/prop_data.c 1.15
  2019.05.08.02.25.50 thorpej src/common/lib/libprop/prop_number.c 1.31
  2019.05.08.02.25.50 thorpej src/common/lib/libprop/prop_object_impl.h 1.33
  2019.05.08.02.25.50 thorpej src/common/lib/libprop/prop_stack.c 1.3
  2019.05.08.02.25.50 thorpej src/common/lib/libprop/prop_string.c 1.13
  2019.05.08.02.25.50 thorpej src/tools/compat/Makefile 1.87
  2019.05.08.02.25.50 thorpej src/tools/compat/sys/rbtree.h 1.1
  2019.05.08.02.25.50 thorpej src/tools/libprop/Makefile 1.2

>How-To-Repeat:

>Fix: