From owner-freebsd-current@FreeBSD.ORG Mon Feb 4 14:42:37 2008 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C48FA16A417; Mon, 4 Feb 2008 14:42:37 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.freebsd.org (Postfix) with ESMTP id 7A96413C43E; Mon, 4 Feb 2008 14:42:37 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (localhost [127.0.0.1]) by spam.des.no (Postfix) with ESMTP id E34302082; Mon, 4 Feb 2008 15:42:28 +0100 (CET) X-Spam-Tests: AWL X-Spam-Learn: disabled X-Spam-Score: -0.2/3.0 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on tim.des.no Received: from ds4.des.no (des.no [80.203.243.180]) by smtp.des.no (Postfix) with ESMTP id 6015D207F; Mon, 4 Feb 2008 15:42:28 +0100 (CET) Received: by ds4.des.no (Postfix, from userid 1001) id 4076C8448B; Mon, 4 Feb 2008 15:42:28 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Alexander Kabaev References: <861w7um5o5.fsf@ds4.des.no> <20080203162918.GK57756@deviant.kiev.zoral.com.ua> <20080203121112.426a8c25@kan.dnsalias.net> Date: Mon, 04 Feb 2008 15:42:28 +0100 In-Reply-To: <20080203121112.426a8c25@kan.dnsalias.net> (Alexander Kabaev's message of "Sun\, 3 Feb 2008 12\:11\:12 -0500") Message-ID: <86zlugeqaz.fsf@ds4.des.no> User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: Kostik Belousov , threads@freebsd.org, current@freebsd.org, Peter Wemm Subject: Re: Symbol versioning errors in libthr X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Feb 2008 14:42:37 -0000 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I've attached my proposed patch. Please yell if there's anything wrong with it. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=pthread.map.diff Index: pthread.map =================================================================== RCS file: /home/ncvs/src/lib/libthr/pthread.map,v retrieving revision 1.22 diff -u -r1.22 pthread.map --- pthread.map 3 Feb 2008 22:38:10 -0000 1.22 +++ pthread.map 4 Feb 2008 14:41:23 -0000 @@ -84,13 +84,9 @@ pthread_multi_np; pthread_mutex_destroy; pthread_mutex_getprioceiling; - pthread_mutex_getspinloops_np; - pthread_mutex_getyieldloops_np; pthread_mutex_init; pthread_mutex_lock; pthread_mutex_setprioceiling; - pthread_mutex_setspinloops_np; - pthread_mutex_setyieldloops_np; pthread_mutex_timedlock; pthread_mutex_trylock; pthread_mutex_unlock; @@ -287,14 +283,9 @@ _pthread_multi_np; _pthread_mutex_destroy; _pthread_mutex_getprioceiling; - _pthread_mutex_getspinloops_np; - _pthread_mutex_getyieldloops_np; _pthread_mutex_init; - _pthread_mutex_init_calloc_cb; _pthread_mutex_lock; _pthread_mutex_setprioceiling; - _pthread_mutex_setspinloops_np; - _pthread_mutex_setyieldloops_np; _pthread_mutex_timedlock; _pthread_mutex_trylock; _pthread_mutex_unlock; @@ -398,14 +389,23 @@ FBSD_1.1 { global: + pthread_mutex_getspinloops_np; + pthread_mutex_getyieldloops_np; pthread_mutex_islocked_np; + pthread_mutex_setspinloops_np; + pthread_mutex_setyieldloops_np; local: *; } FBSD_1.0; FBSDprivate_1.1 { global: + _pthread_mutex_getspinloops_np; + _pthread_mutex_getyieldloops_np; + _pthread_mutex_init_calloc_cb; _pthread_mutex_islocked_np; + _pthread_mutex_setspinloops_np; + _pthread_mutex_setyieldloops_np; local: *; } FBSDprivate_1.0; --=-=-=--