From owner-svn-src-all@FreeBSD.ORG Sat Jun 18 16:19:53 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24742106564A; Sat, 18 Jun 2011 16:19:53 +0000 (UTC) (envelope-from minimarmot@gmail.com) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id 96F428FC0C; Sat, 18 Jun 2011 16:19:52 +0000 (UTC) Received: by gwb15 with SMTP id 15so262336gwb.13 for ; Sat, 18 Jun 2011 09:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=qSc68n57df8mGfbHUY3SraDr01FkQAUaWHGBnHd9BTk=; b=M9pts1orPLdm2PXIt6CHQ+WflZWdtrzZCoAU8lsemKeX/27M43FPqXpDaPVACiVi/x dAU9QLqfCUgakco5HGLXOTITtG5s72Li/7HCGPn8fk73BXyjTsQaYuiXOSV3LCvIkuru aFvldnqzSxOH2a58pkBpFIaXxUJciazW3PRCU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=SXOv1JI/yaZEtu6vEChTWF3uHo4lxSLFua8sL1A0pZcmqrxar6+cEgWCcw+x6CjxHt h9dLLAKM0wVjUJ2C6lcsptoNFPJwKUcxKMkhcL9vqlKMuTjIO5q2wnmMDEolEDM427wX dFE4rFPYrTdiGf1sWG8a0K1jkZnKaLlebJYLE= MIME-Version: 1.0 Received: by 10.236.143.2 with SMTP id k2mr1383087yhj.500.1308412494722; Sat, 18 Jun 2011 08:54:54 -0700 (PDT) Received: by 10.236.108.1 with HTTP; Sat, 18 Jun 2011 08:54:54 -0700 (PDT) In-Reply-To: <201106181356.p5IDuXhW044171@svn.freebsd.org> References: <201106181356.p5IDuXhW044171@svn.freebsd.org> Date: Sat, 18 Jun 2011 11:54:54 -0400 Message-ID: From: Ben Kaduk To: Ben Laurie Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jun 2011 16:19:53 -0000 On Sat, Jun 18, 2011 at 9:56 AM, Ben Laurie wrote: > Author: benl > Date: Sat Jun 18 13:56:33 2011 > New Revision: 223262 > URL: http://svn.freebsd.org/changeset/base/223262 > > Log: > =A0Fix clang warnings. > > =A0Approved by: =A0philip (mentor) > > > Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c =A0 =A0 = =A0 =A0Sat Jun 18 13:54:36 2011 =A0 =A0 =A0 =A0(r223261) > +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c =A0 =A0 = =A0 =A0Sat Jun 18 13:56:33 2011 =A0 =A0 =A0 =A0(r223262) > @@ -45,6 +45,7 @@ > =A0#include > =A0#include > =A0#include > +#include > > =A0#include > > @@ -811,15 +812,14 @@ dt_basename(char *str) > =A0ulong_t > =A0dt_popc(ulong_t x) > =A0{ > -#ifdef _ILP32 > +#if defined(_ILP32) > =A0 =A0 =A0 =A0x =3D x - ((x >> 1) & 0x55555555UL); > =A0 =A0 =A0 =A0x =3D (x & 0x33333333UL) + ((x >> 2) & 0x33333333UL); > =A0 =A0 =A0 =A0x =3D (x + (x >> 4)) & 0x0F0F0F0FUL; > =A0 =A0 =A0 =A0x =3D x + (x >> 8); > =A0 =A0 =A0 =A0x =3D x + (x >> 16); > =A0 =A0 =A0 =A0return (x & 0x3F); > -#endif > -#ifdef _LP64 > +#elif defined(_LP64) > =A0 =A0 =A0 =A0x =3D x - ((x >> 1) & 0x5555555555555555ULL); > =A0 =A0 =A0 =A0x =3D (x & 0x3333333333333333ULL) + ((x >> 2) & 0x33333333= 33333333ULL); > =A0 =A0 =A0 =A0x =3D (x + (x >> 4)) & 0x0F0F0F0F0F0F0F0FULL; > @@ -827,6 +827,8 @@ dt_popc(ulong_t x) > =A0 =A0 =A0 =A0x =3D x + (x >> 16); > =A0 =A0 =A0 =A0x =3D x + (x >> 32); > =A0 =A0 =A0 =A0return (x & 0x7F); > +#else > +# warning need td_popc() implementation We seem to still be in dt_popc(), here. -Ben Kaduk > =A0#endif > =A0} >