Date: Sat, 18 Jun 2011 11:54:54 -0400 From: Ben Kaduk <minimarmot@gmail.com> To: Ben Laurie <benl@freebsd.org> 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... Message-ID: <BANLkTi=ofv36xAo05-4B22Cz6zHA0NQ_8w@mail.gmail.com> In-Reply-To: <201106181356.p5IDuXhW044171@svn.freebsd.org> References: <201106181356.p5IDuXhW044171@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Jun 18, 2011 at 9:56 AM, Ben Laurie <benl@freebsd.org> 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 <assert.h> > =A0#include <libgen.h> > =A0#include <limits.h> > +#include <stdint.h> > > =A0#include <dt_impl.h> > > @@ -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} >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BANLkTi=ofv36xAo05-4B22Cz6zHA0NQ_8w>