From owner-svn-src-all@FreeBSD.ORG Thu Nov 17 21:06:54 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76F581065672; Thu, 17 Nov 2011 21:06:54 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4C8B28FC08; Thu, 17 Nov 2011 21:06:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAHL6sM8029680; Thu, 17 Nov 2011 21:06:54 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAHL6s47029675; Thu, 17 Nov 2011 21:06:54 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201111172106.pAHL6s47029675@svn.freebsd.org> From: Dimitry Andric Date: Thu, 17 Nov 2011 21:06:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227636 - in head: lib/clang/include/llvm/Config tools/build X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 17 Nov 2011 21:06:54 -0000 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)