From owner-svn-src-all@FreeBSD.ORG Tue Nov 24 03:23:41 2009 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 3F359106566B; Tue, 24 Nov 2009 03:23:41 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2DFD78FC1A; Tue, 24 Nov 2009 03:23:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAO3NeP1003821; Tue, 24 Nov 2009 03:23:41 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO3NesL003820; Tue, 24 Nov 2009 03:23:40 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <200911240323.nAO3NesL003820@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 24 Nov 2009 03:23:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199730 - in stable/8/lib/libthr/arch/ia64: . ia64 include 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, 24 Nov 2009 03:23:41 -0000 Author: marcel Date: Tue Nov 24 03:23:40 2009 New Revision: 199730 URL: http://svn.freebsd.org/changeset/base/199730 Log: MFC r198450: Implement _umtx_op_err() for ia64. Added: stable/8/lib/libthr/arch/ia64/ia64/_umtx_op_err.S - copied unchanged from r198450, head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S Modified: stable/8/lib/libthr/arch/ia64/Makefile.inc stable/8/lib/libthr/arch/ia64/include/pthread_md.h Directory Properties: stable/8/lib/libthr/ (props changed) Modified: stable/8/lib/libthr/arch/ia64/Makefile.inc ============================================================================== --- stable/8/lib/libthr/arch/ia64/Makefile.inc Tue Nov 24 03:17:00 2009 (r199729) +++ stable/8/lib/libthr/arch/ia64/Makefile.inc Tue Nov 24 03:23:40 2009 (r199730) @@ -2,4 +2,4 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= _umtx_op_err.S pthread_md.c Copied: stable/8/lib/libthr/arch/ia64/ia64/_umtx_op_err.S (from r198450, head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/lib/libthr/arch/ia64/ia64/_umtx_op_err.S Tue Nov 24 03:23:40 2009 (r199730, copy of r198450, head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S) @@ -0,0 +1,35 @@ +/*- + * Copyright (c) 2009 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. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +ENTRY(_umtx_op_err, 5) + CALLSYS_NOERROR(_umtx_op) + br.ret.sptk.few rp +END(_umtx_op_err) Modified: stable/8/lib/libthr/arch/ia64/include/pthread_md.h ============================================================================== --- stable/8/lib/libthr/arch/ia64/include/pthread_md.h Tue Nov 24 03:17:00 2009 (r199729) +++ stable/8/lib/libthr/arch/ia64/include/pthread_md.h Tue Nov 24 03:23:40 2009 (r199730) @@ -33,6 +33,8 @@ #define CPU_SPINWAIT +#define HAS__UMTX_OP_ERR 1 + #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /*