From owner-svn-src-all@FreeBSD.ORG Fri Oct 4 18:27:03 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8E40157E; Fri, 4 Oct 2013 18:27:03 +0000 (UTC) (envelope-from nwhitehorn@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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 610EF2E4F; Fri, 4 Oct 2013 18:27:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r94IR3Oa063459; Fri, 4 Oct 2013 18:27:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94IR2Nb063455; Fri, 4 Oct 2013 18:27:02 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201310041827.r94IR2Nb063455@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 4 Oct 2013 18:27:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256055 - in head/usr.bin: . svn svn/lib/libapr 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.14 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, 04 Oct 2013 18:27:03 -0000 Author: nwhitehorn Date: Fri Oct 4 18:27:02 2013 New Revision: 256055 URL: http://svnweb.freebsd.org/changeset/base/256055 Log: Disable use of compiler atomic builtins. For APR, this is limited to architectures where they are known not to work. For SVN itself, use the least common denominator and disable them across the board. This allows svnlite to build and run on all FreeBSD architectures. Approved by: re (gjb) Modified: head/usr.bin/Makefile head/usr.bin/svn/lib/libapr/apr_private.h head/usr.bin/svn/svn_private_config.h Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Fri Oct 4 17:52:56 2013 (r256054) +++ head/usr.bin/Makefile Fri Oct 4 18:27:02 2013 (r256055) @@ -366,13 +366,9 @@ SUBDIR+= users SUBDIR+= who .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || \ - ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "i386" || \ - (${MACHINE_ARCH} == "armv6" && ${COMPILER_TYPE} == "clang") .if ${MK_SVN} == "yes" || ${MK_SVNLITE} == "yes" SUBDIR+= svn .endif -.endif .include Modified: head/usr.bin/svn/lib/libapr/apr_private.h ============================================================================== --- head/usr.bin/svn/lib/libapr/apr_private.h Fri Oct 4 17:52:56 2013 (r256054) +++ head/usr.bin/svn/lib/libapr/apr_private.h Fri Oct 4 18:27:02 2013 (r256055) @@ -97,7 +97,9 @@ #define HAVE_ARPA_INET_H 1 /* Define if compiler provides atomic builtins */ +#if !defined(__mips__) && !defined(__arm__) #define HAVE_ATOMIC_BUILTINS 1 +#endif /* Define if BONE_VERSION is defined in sys/socket.h */ /* #undef HAVE_BONE_VERSION */ Modified: head/usr.bin/svn/svn_private_config.h ============================================================================== --- head/usr.bin/svn/svn_private_config.h Fri Oct 4 17:52:56 2013 (r256054) +++ head/usr.bin/svn/svn_private_config.h Fri Oct 4 18:27:02 2013 (r256055) @@ -153,7 +153,7 @@ #define SVN_FS_WANT_DB_PATCH 14 /* Define if compiler provides atomic builtins */ -#define SVN_HAS_ATOMIC_BUILTINS 1 +#define SVN_HAS_ATOMIC_BUILTINS 0 /* Is GNOME Keyring support enabled? */ /* #undef SVN_HAVE_GNOME_KEYRING */