Date: Fri, 4 Oct 2013 18:27:02 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> 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 Message-ID: <201310041827.r94IR2Nb063455@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.arch.inc.mk> 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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310041827.r94IR2Nb063455>