From owner-svn-src-all@FreeBSD.ORG Tue Nov 15 20:15:59 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 292D71065670; Tue, 15 Nov 2011 20:15:59 +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 0EA6E8FC13; Tue, 15 Nov 2011 20:15:59 +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 pAFKFwxm015334; Tue, 15 Nov 2011 20:15:58 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAFKFwqb015331; Tue, 15 Nov 2011 20:15:58 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201111152015.pAFKFwqb015331@svn.freebsd.org> From: Dimitry Andric Date: Tue, 15 Nov 2011 20:15:58 +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: r227538 - head/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: Tue, 15 Nov 2011 20:15:59 -0000 Author: dim Date: Tue Nov 15 20:15:58 2011 New Revision: 227538 URL: http://svn.freebsd.org/changeset/base/227538 Log: LLVM uses atomic operations, which are not supported on i386 and GCC emits calls for them, rather than expanding them inline. Older FreeBSD versions compile for i386 by default and as such we end up with unresolved symbols when we build LLVM's TableGen utility as a build tool on them. Add the functions that GCC emits here, but don't bother to make them atomic. Such is not needed. Submitted by: marcel MFC after: 1 week Added: head/tools/build/atomic.c (contents, props changed) Modified: head/tools/build/Makefile Modified: head/tools/build/Makefile ============================================================================== --- head/tools/build/Makefile Tue Nov 15 20:11:03 2011 (r227537) +++ head/tools/build/Makefile Tue Nov 15 20:15:58 2011 (r227538) @@ -7,6 +7,10 @@ SRCS= INCSGROUPS= INCS INCS= +.if ${MACHINE_ARCH} == i386 +SRCS+= atomic.c +.endif + BOOTSTRAPPING?= 0 .if empty(SRCS) Added: head/tools/build/atomic.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/atomic.c Tue Nov 15 20:15:58 2011 (r227538) @@ -0,0 +1,56 @@ +/*- + * 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 + +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; +}