From d25d7b7d6ef2c0777bbf80cdf8585edf21d75972 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Fri, 4 Oct 2013 18:27:02 +0000 Subject: [PATCH] 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) --- usr.bin/Makefile | 4 ---- usr.bin/svn/lib/libapr/apr_private.h | 2 ++ usr.bin/svn/svn_private_config.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 985c2df72a5..92958ae55f1 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -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 diff --git a/usr.bin/svn/lib/libapr/apr_private.h b/usr.bin/svn/lib/libapr/apr_private.h index fcbbbd30cb2..492a4f1df0c 100644 --- a/usr.bin/svn/lib/libapr/apr_private.h +++ b/usr.bin/svn/lib/libapr/apr_private.h @@ -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 */ diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h index 00eb0fc5d5e..061109534b7 100644 --- a/usr.bin/svn/svn_private_config.h +++ b/usr.bin/svn/svn_private_config.h @@ -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 */