From owner-svn-src-head@FreeBSD.ORG Mon May 4 13:29:38 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4AF916F5; Mon, 4 May 2015 13:29:38 +0000 (UTC) Received: from relay.mailchannels.net (ar-005-i191.relay.mailchannels.net [162.253.144.73]) by mx1.freebsd.org (Postfix) with ESMTP id AC1231E51; Mon, 4 May 2015 13:29:35 +0000 (UTC) X-Sender-Id: duocircle|x-authuser|hippie Received: from smtp4.ore.mailhop.org (ip-10-213-14-133.us-west-2.compute.internal [10.213.14.133]) by relay.mailchannels.net (Postfix) with ESMTPA id CF53E12181A; Mon, 4 May 2015 13:29:27 +0000 (UTC) X-Sender-Id: duocircle|x-authuser|hippie Received: from smtp4.ore.mailhop.org (smtp4.ore.mailhop.org [10.45.8.167]) (using TLSv1 with cipher DHE-RSA-AES256-SHA) by 0.0.0.0:2500 (trex/5.4.8); Mon, 04 May 2015 13:29:28 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: duocircle|x-authuser|hippie X-MailChannels-Auth-Id: duocircle X-MC-Loop-Signature: 1430746168194:1522415573 X-MC-Ingress-Time: 1430746168194 Received: from c-73-34-117-227.hsd1.co.comcast.net ([73.34.117.227] helo=ilsoft.org) by smtp4.ore.mailhop.org with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1YpGR3-0000tG-Ts; Mon, 04 May 2015 13:29:26 +0000 Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t44DTMqP060255; Mon, 4 May 2015 07:29:22 -0600 (MDT) (envelope-from ian@freebsd.org) X-Mail-Handler: DuoCircle Outbound SMTP X-Originating-IP: 73.34.117.227 X-Report-Abuse-To: abuse@duocircle.com (see https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information for abuse reporting information) X-MHO-User: U2FsdGVkX18ycSAWKQ9f/AqM/LM6F3J/ Message-ID: <1430746162.6170.74.camel@freebsd.org> Subject: Re: svn commit: r282415 - head/usr.sbin/ntp From: Ian Lepore To: Cy Schubert Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Mon, 04 May 2015 07:29:22 -0600 In-Reply-To: <201505041242.t44CgrTd090709@svn.freebsd.org> References: <201505041242.t44CgrTd090709@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.10 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-AuthUser: hippie X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2015 13:29:38 -0000 On Mon, 2015-05-04 at 12:42 +0000, Cy Schubert wrote: > Author: cy > Date: Mon May 4 12:42:52 2015 > New Revision: 282415 > URL: https://svnweb.freebsd.org/changeset/base/282415 > > Log: > Restore CPU dependent compile time conditionals. > > MFC after: 1 month (with r281143 and r282408) > > Modified: > head/usr.sbin/ntp/config.h > > Modified: head/usr.sbin/ntp/config.h > ============================================================================== > --- head/usr.sbin/ntp/config.h Mon May 4 09:33:57 2015 (r282414) > +++ head/usr.sbin/ntp/config.h Mon May 4 12:42:52 2015 (r282415) > @@ -1469,13 +1469,21 @@ > /* #undef SCO5_CLOCK */ > > /* The size of `char*', as computed by sizeof. */ > +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) > #define SIZEOF_CHARP 8 > +#else > +#define SIZEOF_CHARP 4 > +#endif > > /* The size of `int', as computed by sizeof. */ > #define SIZEOF_INT 4 > > /* The size of `long', as computed by sizeof. */ > +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) > #define SIZEOF_LONG 8 > +#else > +#define SIZEOF_LONG 4 > +#endif > > /* The size of `long long', as computed by sizeof. */ > #define SIZEOF_LONG_LONG 8 > @@ -1490,7 +1498,11 @@ > #define SIZEOF_SIGNED_CHAR 1 > > /* The size of `time_t', as computed by sizeof. */ > +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) > #define SIZEOF_TIME_T 8 > +#else > +#define SIZEOF_TIME_T 4 > +#endif > > /* Does SIOCGIFCONF return size in the buffer? */ > /* #undef SIZE_RETURNED_IN_BUFFER */ > @@ -1516,7 +1528,15 @@ > /* #undef STRERROR_R_CHAR_P */ > > /* canonical system (cpu-vendor-os) of where we should run */ > -#define STR_SYSTEM "amd64-portbld-freebsd10.1" > +#if defined(__alpha__) > +#define STR_SYSTEM "alpha-undermydesk-freebsd" > +#elif defined(__sparc64__) > +#define STR_SYSTEM "sparc64-undermydesk-freebsd" > +#elif defined(__amd64__) > +#define STR_SYSTEM "amd64-undermydesk-freebsd" > +#else > +#define STR_SYSTEM "i386-undermydesk-freebsd" > +#endif > > /* Does Xettimeofday take 1 arg? */ > /* #undef SYSV_TIMEOFDAY */ > I suspect arm64 should appear in the same places as amd64. arm (all flavors) should also be in the list of 8-byte time_t. Should NTP_KEYSDIR be /usr/etc rather than /usr/local/etc for the base daemon? (/usr/local shows up in a couple places in config.h) I think WORDS_BIGENDIAN needs to be defined on the platforms where that's true. The list of ifdefs for STR_SYSTEM seems a bit beyond its sell-by date. -- Ian