[head tinderbox] failure on sparc64/sparc64

[Xin Li]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 3/24/13 12:20 AM, FreeBSD Tinderbox wrote:
> TB --- 2013-03-24 06:26:48 - tinderbox 2.10 running on
> freebsd-current.sentex.ca TB --- 2013-03-24 06:26:48 - FreeBSD
> freebsd-current.sentex.ca 8.3-PRERELEASE FreeBSD 8.3-PRERELEASE #0:
> Mon Mar 26 13:54:12 EDT 2012
> des at freebsd-current.sentex.ca:/usr/obj/usr/src/sys/GENERIC  amd64 
> TB --- 2013-03-24 06:26:48 - starting HEAD tinderbox run for
> sparc64/sparc64 TB --- 2013-03-24 06:26:48 - cleaning the object
> tree TB --- 2013-03-24 06:26:48 - /usr/local/bin/svn stat /src TB
> --- 2013-03-24 06:26:53 - At svn revision 248671 TB --- 2013-03-24
> 06:26:54 - building world TB --- 2013-03-24 06:26:54 -
> CROSS_BUILD_TESTING=YES TB --- 2013-03-24 06:26:54 -
> MAKEOBJDIRPREFIX=/obj TB --- 2013-03-24 06:26:54 -
> PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2013-03-24 06:26:54 -
> SRCCONF=/dev/null TB --- 2013-03-24 06:26:54 - TARGET=sparc64 TB
> --- 2013-03-24 06:26:54 - TARGET_ARCH=sparc64 TB --- 2013-03-24
> 06:26:54 - TZ=UTC TB --- 2013-03-24 06:26:54 -
> __MAKE_CONF=/dev/null TB --- 2013-03-24 06:26:54 - cd /src TB ---
> 2013-03-24 06:26:54 - /usr/bin/make -B buildworld
>>>> Building an up-to-date make(1) World build started on Sun Mar
>>>> 24 06:26:59 UTC 2013 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  -I/src/sbin/fsck_ffs
> -I/src/sbin/fsck_ffs/../mount -DRESCUE -std=gnu99 -fstack-protector
> -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized
> -Wno-pointer-sign -c /src/sbin/fsck_ffs/ea.c cc -O2 -pipe
> -I/src/sbin/fsck_ffs -I/src/sbin/fsck_ffs/../mount -DRESCUE
> -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall
> -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c
> /src/sbin/fsck_ffs/fsutil.c cc1: warnings being treated as errors 
> /src/sbin/fsck_ffs/fsutil.c: In function 'printIOstats': 
> /src/sbin/fsck_ffs/fsutil.c:511: warning: format '%d' expects type
> 'int', but argument 2 has type 'time_t' 
> /src/sbin/fsck_ffs/fsutil.c:526: warning: format '%4d' expects type
> 'int', but argument 6 has type 'time_t' 
> /src/sbin/fsck_ffs/fsutil.c:526: warning: format '%2jd' expects
> type 'intmax_t', but argument 8 has type 'long long int' 
> /src/sbin/fsck_ffs/fsutil.c:526: warning: format '%jd' expects type
> 'intmax_t', but argument 9 has type 'long long int' *** [fsutil.o]
> Error code 1

This should fix the issue, can someone review and commit it?

Index: sbin/fsck_ffs/fsutil.c
===================================================================
- --- sbin/fsck_ffs/fsutil.c      (revision 248678)
+++ sbin/fsck_ffs/fsutil.c      (working copy)
@@ -507,8 +507,8 @@ static void printIOstats(void)

        clock_gettime(CLOCK_REALTIME_PRECISE, &finishpass);
        timespecsub(&finishpass, &startpass);
- -       printf("Running time: %ld.%03ld msec\n",
- -               finishpass.tv_sec, finishpass.tv_nsec / 1000000);
+       printf("Running time: %jd.%03jd msec\n",
+               (intmax_t)finishpass.tv_sec,
(intmax_t)finishpass.tv_nsec / 1000000);
        printf("buffer reads by type:\n");
        for (totalmsec = 0, i = 0; i < BT_NUMBUFTYPES; i++)
                totalmsec += readtime[i].tv_sec * 1000 +
@@ -519,10 +519,10 @@ static void printIOstats(void)
                if (readcnt[i] == 0)
                        continue;
                msec = readtime[i].tv_sec * 1000 + readtime[i].tv_nsec
/ 1000000;
- -               printf("%21s:%8ld %2ld.%ld%% %4ld.%03ld sec
%2lld.%lld%%\n",
+               printf("%21s:%8ld %2ld.%ld%% %4jd.%03jd sec
%2lld.%lld%%\n",
                    buftype[i], readcnt[i], readcnt[i] * 100 / diskreads,
                    (readcnt[i] * 1000 / diskreads) % 10,
- -                   readtime[i].tv_sec, readtime[i].tv_nsec / 1000000,
+                   (intmax_t)readtime[i].tv_sec,
(intmax_t)readtime[i].tv_nsec / 1000000,
                    msec * 100 / totalmsec, (msec * 1000 / totalmsec)
% 10);
        }
        printf("\n");

Cheers,
-----BEGIN PGP SIGNATURE-----

iQEcBAEBCAAGBQJRTsUUAAoJEG80Jeu8UPuziSkIAImVgY8aEExJ1b2zLu2wLL2y
hHpQ+oMf63WFEQ3XN+wYnY0sZyjpBCTUULkdSQPbnj9eymJ8UkaPkdvE2JN4jWDu
UqTuSI4E7IYZpoH06LiAZTnNFI0+H072sdFTw7bUVwLTm4x7lOUD2G9JFZCOhBKi
QyXJ1r6i/jTORoRH+3oAYEl5hZk9IniFBkQp7i5Elzm/mxFpT/H7b48ptTmv+3+o
fKRLduuu6zNd+DtCOUmPAgyOOLyh1szAxhoIdQj5iopRgzdS1f5uQ7xP+SWqDhrl
PdT8YtEfFuXFeAg+PpgDWTank7lMKn4QBNn9g4CsvLrs4eA/JN3aSStuMWkzfgQ=
=VsRR
-----END PGP SIGNATURE-----