From owner-svn-src-all@freebsd.org Fri Jun 26 03:29:24 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C16B98C7E0; Fri, 26 Jun 2015 03:29:24 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ECDD812FB; Fri, 26 Jun 2015 03:29:23 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5Q3TNRA022196; Fri, 26 Jun 2015 03:29:23 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5Q3TNDv022195; Fri, 26 Jun 2015 03:29:23 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201506260329.t5Q3TNDv022195@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 26 Jun 2015 03:29:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284864 - head/usr.sbin/ntp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 26 Jun 2015 03:29:24 -0000 Author: cy Date: Fri Jun 26 03:29:23 2015 New Revision: 284864 URL: https://svnweb.freebsd.org/changeset/base/284864 Log: Add support for additional architectures in ntp. Differential Revision: D2720 Reviewed by: jmg, reoberto, andrew, ian, imp Modified: head/usr.sbin/ntp/config.h Modified: head/usr.sbin/ntp/config.h ============================================================================== --- head/usr.sbin/ntp/config.h Thu Jun 25 23:16:01 2015 (r284863) +++ head/usr.sbin/ntp/config.h Fri Jun 26 03:29:23 2015 (r284864) @@ -1379,7 +1379,7 @@ /* #undef NO_THREADS */ /* Default location of crypto key info */ -#define NTP_KEYSDIR "/usr/local/etc" +#define NTP_KEYSDIR "/etc/ntp" /* Path to sign daemon rendezvous socket */ #define NTP_SIGND_PATH "/var/run/ntp_signd" @@ -1469,7 +1469,7 @@ /* #undef SCO5_CLOCK */ /* The size of `char*', as computed by sizeof. */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#ifdef __LP64__ #define SIZEOF_CHARP 8 #else #define SIZEOF_CHARP 4 @@ -1479,7 +1479,7 @@ #define SIZEOF_INT 4 /* The size of `long', as computed by sizeof. */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#ifdef __LP64__ #define SIZEOF_LONG 8 #else #define SIZEOF_LONG 4 @@ -1498,10 +1498,10 @@ #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 +#if defined(__i386__) || defined(__powerpc__) #define SIZEOF_TIME_T 4 +#else +#define SIZEOF_TIME_T 8 #endif /* Does SIOCGIFCONF return size in the buffer? */ @@ -1534,6 +1534,24 @@ #define STR_SYSTEM "sparc64-undermydesk-freebsd" #elif defined(__amd64__) #define STR_SYSTEM "amd64-undermydesk-freebsd" +#elif defined(__powerpc64__) +#define STR_SYSTEM "powerpc64-undermydesk-freebsd" +#elif defined(__powerpc__) +#define STR_SYSTEM "powerpc-undermydesk-freebsd" +#elif defined(__mips64) +#define STR_SYSTEM "mips64-undermydesk-freebsd" +#elif defined(__mips__) +#define STR_SYSTEM "mips-undermydesk-freebsd" +#elif defined(__aarch64__) +#define STR_SYSTEM "arm64-undermydesk-freebsd" +#elif defined(__arm__) +#define STR_SYSTEM "arm-undermydesk-freebsd" +#elif defined(__sparc64__) +#define STR_SYSTEM "sparc64-undermydesk-freebsd" +#elif defined(__sparc__) +#define STR_SYSTEM "sparc-undermydesk-freebsd" +#elif defined(__ia64__) +#define STR_SYSTEM "ia64-undermydesk-freebsd" #else #define STR_SYSTEM "i386-undermydesk-freebsd" #endif @@ -1600,14 +1618,9 @@ typedef unsigned int uintptr_t; /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif +#if defined(__ARMEB__) || defined(__MIPSEB__) || defined(__powerpc__) || \ + defined(__powerpc64__) || defined(__sparc64__) +#define WORDS_BIGENDIAN 1 #endif /* routine worker child proc uses to exit. */