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 _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
