Re: [head tinderbox] failure on sparc64/sparc64

On Thu, Jun 30, 2011 at 3:34 PM, FreeBSD Tinderbox
<tinderbox_at_freebsd.org> wrote:
> TB --- 2011-06-30 21:40:13 - tinderbox 2.7 running on freebsd-current.sentex.ca
> TB --- 2011-06-30 21:40:13 - starting HEAD tinderbox run for sparc64/sparc64
> TB --- 2011-06-30 21:40:13 - cleaning the object tree
> TB --- 2011-06-30 21:40:31 - cvsupping the source tree
> TB --- 2011-06-30 21:40:31 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sparc64/supfile
> TB --- 2011-06-30 21:40:45 - building world
> TB --- 2011-06-30 21:40:45 - MAKEOBJDIRPREFIX=/obj
> TB --- 2011-06-30 21:40:45 - PATH=/usr/bin:/usr/sbin:/bin:/sbin
> TB --- 2011-06-30 21:40:45 - TARGET=sparc64
> TB --- 2011-06-30 21:40:45 - TARGET_ARCH=sparc64
> TB --- 2011-06-30 21:40:45 - TZ=UTC
> TB --- 2011-06-30 21:40:45 - __MAKE_CONF=/dev/null
> TB --- 2011-06-30 21:40:45 - cd /src
> TB --- 2011-06-30 21:40:45 - /usr/bin/make -B buildworld
>>>> World build started on Thu Jun 30 21:40:45 UTC 2011
>>>> Rebuilding the temporary build tree
>>>> stage 1.1: legacy release compatibility shims
>>>> stage 1.2: bootstrap tools
>>>> stage 2.1: cleaning up the object tree
>>>> stage 2.2: rebuilding the object tree
>>>> stage 2.3: build tools
>>>> stage 3: cross tools
>>>> stage 4.1: building includes
>>>> stage 4.2: building libraries
>>>> stage 4.3: make dependencies
>>>> stage 4.4: building everything
> [...]
> cc -O2 -pipe  -DLOADER_DISK_SUPPORT -DLOADER_UFS_SUPPORT -DLOADER_CD9660_SUPPORT -DLOADER_GZIP_SUPPORT -DLOADER_NET_SUPPORT -DLOADER_NFS_SUPPORT -DLOADER_TFTP_SUPPORT -DBOOT_FORTH -I/src/sys/boot/sparc64/loader/../../ficl -I/src/sys/boot/sparc64/loader/../../ficl/sparc64 -I/src/sys/boot/sparc64/loader/../../common -I. -DNETIF_OPEN_CLOSE_ONCE -I/src/sys/boot/sparc64/loader/../../ofw/libofw/ -I/src/sys/boot/sparc64/loader/../../../../lib/libstand/ -ffreestanding -std=gnu99  -c /src/sys/boot/sparc64/loader/../../common/devopen.c
> cc -O2 -pipe  -DLOADER_DISK_SUPPORT -DLOADER_UFS_SUPPORT -DLOADER_CD9660_SUPPORT -DLOADER_GZIP_SUPPORT -DLOADER_NET_SUPPORT -DLOADER_NFS_SUPPORT -DLOADER_TFTP_SUPPORT -DBOOT_FORTH -I/src/sys/boot/sparc64/loader/../../ficl -I/src/sys/boot/sparc64/loader/../../ficl/sparc64 -I/src/sys/boot/sparc64/loader/../../common -I. -DNETIF_OPEN_CLOSE_ONCE -I/src/sys/boot/sparc64/loader/../../ofw/libofw/ -I/src/sys/boot/sparc64/loader/../../../../lib/libstand/ -ffreestanding -std=gnu99  -c /src/sys/boot/sparc64/loader/../../common/disk.c
> /src/sys/boot/sparc64/loader/../../common/disk.c: In function 'disk_openmbr':
> /src/sys/boot/sparc64/loader/../../common/disk.c:328: error: 'LABELSECTOR' undeclared (first use in this function)
> /src/sys/boot/sparc64/loader/../../common/disk.c:328: error: (Each undeclared identifier is reported only once
> /src/sys/boot/sparc64/loader/../../common/disk.c:328: error: for each function it appears in.)
> /src/sys/boot/sparc64/loader/../../common/disk.c: In function 'disk_printbsdslice':
> /src/sys/boot/sparc64/loader/../../common/disk.c:376: error: 'LABELSECTOR' undeclared (first use in this function)
> *** Error code 1
>
> Stop in /src/sys/boot/sparc64/loader.
> *** Error code 1
>
> Stop in /src/sys/boot/sparc64.
> *** Error code 1
>
> Stop in /src/sys/boot.
> *** Error code 1
>
> Stop in /src/sys.
> *** Error code 1
>
> Stop in /src.
> *** Error code 1
>
> Stop in /src.
> *** Error code 1

It looks like r223695 broke sparc64:

$ grep -B 3 -r LABELSECTOR /usr/include/
/usr/include/sys/disklabel.h-/* XXX these should be defined per
controller (or drive) elsewhere, not here! */
/usr/include/sys/disklabel.h-#if defined(__i386__) ||
defined(__amd64__) || defined(__arm__) || \
/usr/include/sys/disklabel.h-    defined(__ia64__) ||
defined(__powerpc__) || defined(__mips__)
/usr/include/sys/disklabel.h:#define LABELSECTOR        1
        /* sector containing label */

Thanks,
-Garrett