From owner-svn-src-head@FreeBSD.ORG Sat Jun 18 20:48:38 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 401391065670;
Sat, 18 Jun 2011 20:48:38 +0000 (UTC) (envelope-from jilles@stack.nl)
Received: from mx1.stack.nl (relay02.stack.nl [IPv6:2001:610:1108:5010::104])
by mx1.freebsd.org (Postfix) with ESMTP id D2C978FC18;
Sat, 18 Jun 2011 20:48:37 +0000 (UTC)
Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132])
by mx1.stack.nl (Postfix) with ESMTP id CAA00359411;
Sat, 18 Jun 2011 22:48:36 +0200 (CEST)
Received: by turtle.stack.nl (Postfix, from userid 1677)
id B35161742A; Sat, 18 Jun 2011 22:48:36 +0200 (CEST)
Date: Sat, 18 Jun 2011 22:48:36 +0200
From: Jilles Tjoelker <jilles@stack.nl>
To: Ben Laurie <benl@FreeBSD.org>
Message-ID: <20110618204836.GA46582@stack.nl>
References: <201106181356.p5IDuXhW044171@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201106181356.p5IDuXhW044171@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
src-committers@freebsd.org
Subject: Re: svn commit: r223262 - in head:
cddl/contrib/opensolaris/lib/libdtrace/common contrib/binutils/bfd
contrib/binutils/gas contrib/binutils/gas/config contrib/binutils/ld
contrib/binutils/opcodes contr...
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jun 2011 20:48:38 -0000
On Sat, Jun 18, 2011 at 01:56:33PM +0000, Ben Laurie wrote:
> Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
> ==============================================================================
> --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c Sat Jun 18 13:54:36 2011 (r223261)
> +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c Sat Jun 18 13:56:33 2011 (r223262)
> @@ -45,6 +45,7 @@
> #include <assert.h>
> #include <libgen.h>
> #include <limits.h>
> +#include <stdint.h>
>
> #include <dt_impl.h>
>
> @@ -811,15 +812,14 @@ dt_basename(char *str)
> ulong_t
> dt_popc(ulong_t x)
> {
> -#ifdef _ILP32
> +#if defined(_ILP32)
> x = x - ((x >> 1) & 0x55555555UL);
> x = (x & 0x33333333UL) + ((x >> 2) & 0x33333333UL);
> x = (x + (x >> 4)) & 0x0F0F0F0FUL;
> x = x + (x >> 8);
> x = x + (x >> 16);
> return (x & 0x3F);
> -#endif
> -#ifdef _LP64
> +#elif defined(_LP64)
> x = x - ((x >> 1) & 0x5555555555555555ULL);
> x = (x & 0x3333333333333333ULL) + ((x >> 2) & 0x3333333333333333ULL);
> x = (x + (x >> 4)) & 0x0F0F0F0F0F0F0F0FULL;
> @@ -827,6 +827,8 @@ dt_popc(ulong_t x)
> x = x + (x >> 16);
> x = x + (x >> 32);
> return (x & 0x7F);
> +#else
> +# warning need td_popc() implementation
> #endif
> }
This commit uncovers breakage that had been present for a while. If I
compile this on stable/8 i386 for head i386, _ILP32 is not defined and
the warning is hit, breaking the build. Apparently, the code had been
broken for a while but I do not use dtrace so I would not have noticed.
The tinderboxes have now also noticed the problem so it is not something
weird about my system.
--
Jilles Tjoelker