svn commit: r227636 - in head: lib/clang/include/llvm/Config tools/build

Dimitry Andric dim at FreeBSD.org
Thu Nov 17 21:06:54 UTC 2011


Author: dim
Date: Thu Nov 17 21:06:53 2011
New Revision: 227636
URL: http://svn.freebsd.org/changeset/base/227636

Log:
  Revert r227538, since it doesn't compile with clang at all (it doesn't
  allow the built-in operations to be redefined, at least not without
  excessive force).
  
  Instead, just disable LLVM's support for atomic operations for now.
  Nothing in either clang or the tablegen tools currently depends on it.
  
  This still allows users of head built before r198344 to upgrade to
  top-of-head seamlessly.

Deleted:
  head/tools/build/atomic.c
Modified:
  head/lib/clang/include/llvm/Config/config.h
  head/lib/clang/include/llvm/Config/llvm-config.h
  head/tools/build/Makefile

Modified: head/lib/clang/include/llvm/Config/config.h
==============================================================================
--- head/lib/clang/include/llvm/Config/config.h	Thu Nov 17 20:46:51 2011	(r227635)
+++ head/lib/clang/include/llvm/Config/config.h	Thu Nov 17 21:06:53 2011	(r227636)
@@ -552,9 +552,7 @@
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
-#ifndef __tune_i386__
-#define LLVM_HAS_ATOMICS 1
-#endif
+#define LLVM_HAS_ATOMICS 0
 
 /* Host triple we were built on */
 /* #undef LLVM_HOSTTRIPLE */

Modified: head/lib/clang/include/llvm/Config/llvm-config.h
==============================================================================
--- head/lib/clang/include/llvm/Config/llvm-config.h	Thu Nov 17 20:46:51 2011	(r227635)
+++ head/lib/clang/include/llvm/Config/llvm-config.h	Thu Nov 17 21:06:53 2011	(r227636)
@@ -34,9 +34,7 @@
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
-#ifndef __tune_i386__
-#define LLVM_HAS_ATOMICS 1
-#endif
+#define LLVM_HAS_ATOMICS 0
 
 /* Host triple we were built on */
 /* #undef LLVM_HOSTTRIPLE */

Modified: head/tools/build/Makefile
==============================================================================
--- head/tools/build/Makefile	Thu Nov 17 20:46:51 2011	(r227635)
+++ head/tools/build/Makefile	Thu Nov 17 21:06:53 2011	(r227636)
@@ -7,10 +7,6 @@ SRCS=
 INCSGROUPS=	INCS
 INCS=		
 
-.if ${MACHINE_ARCH} == i386
-SRCS+=		atomic.c
-.endif
-
 BOOTSTRAPPING?=	0
 
 .if empty(SRCS)


More information about the svn-src-head mailing list