diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 5ecb51ca0dd3..92c960bc2844 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -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 */
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index 28837f787e96..1b50ab879902 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -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 */
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 4eb75481f0a5..8e26c29d7735 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -7,10 +7,6 @@ SRCS=
 INCSGROUPS=	INCS
 INCS=		
 
-.if ${MACHINE_ARCH} == i386
-SRCS+=		atomic.c
-.endif
-
 BOOTSTRAPPING?=	0
 
 .if empty(SRCS)
diff --git a/tools/build/atomic.c b/tools/build/atomic.c
deleted file mode 100644
index 72eef9f69684..000000000000
--- a/tools/build/atomic.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2011 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <stdint.h>
-
-uint32_t __sync_add_and_fetch_4(uint32_t *, uint32_t);
-uint32_t __sync_sub_and_fetch_4(uint32_t *, uint32_t);
-uint32_t __sync_val_compare_and_swap_4(uint32_t *, uint32_t, uint32_t);
-
-uint32_t
-__sync_add_and_fetch_4(uint32_t *ptr, uint32_t val)
-{
-	*ptr += val;
-	return *ptr;
-}
-
-uint32_t
-__sync_sub_and_fetch_4(uint32_t *ptr, uint32_t val)
-{
-	*ptr -= val;
-	return *ptr;
-}
-
-uint32_t
-__sync_val_compare_and_swap_4(uint32_t *ptr, uint32_t oldval, uint32_t newval)
-{
-	uint32_t res = *ptr;
-	if (res == oldval)
-		*ptr = newval;
-	return res;
-}