From patchwork Wed Oct 21 07:12:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 533612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id DF3911409F8 for ; Wed, 21 Oct 2015 18:13:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4FCFE8D246; Wed, 21 Oct 2015 07:13:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RYdeo0PbngmK; Wed, 21 Oct 2015 07:12:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4DA198D2A4; Wed, 21 Oct 2015 07:12:58 +0000 (UTC) X-Original-To: uclibc@lists.busybox.net Delivered-To: uclibc@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 31C351BFBF9 for ; Wed, 21 Oct 2015 07:12:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2B0C4328B9 for ; Wed, 21 Oct 2015 07:12:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2G76FGJNvAE4 for ; Wed, 21 Oct 2015 07:12:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtprelay.synopsys.com (smtprelay.synopsys.com [198.182.47.9]) by silver.osuosl.org (Postfix) with ESMTPS id 6A278268EE for ; Wed, 21 Oct 2015 07:12:56 +0000 (UTC) Received: from us02secmta1.synopsys.com (us02secmta1.synopsys.com [10.12.235.96]) by smtprelay.synopsys.com (Postfix) with ESMTP id 116AB24E0CB8; Wed, 21 Oct 2015 00:12:56 -0700 (PDT) Received: from us02secmta1.internal.synopsys.com (us02secmta1.internal.synopsys.com [127.0.0.1]) by us02secmta1.internal.synopsys.com (Service) with ESMTP id 0530F4E213; Wed, 21 Oct 2015 00:12:56 -0700 (PDT) Received: from mailhost.synopsys.com (unknown [10.13.184.66]) by us02secmta1.internal.synopsys.com (Service) with ESMTP id D96684E202; Wed, 21 Oct 2015 00:12:55 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id CB9C89DC; Wed, 21 Oct 2015 00:12:55 -0700 (PDT) Received: from US01WEHTC2.internal.synopsys.com (us01wehtc2.internal.synopsys.com [10.12.239.237]) by mailhost.synopsys.com (Postfix) with ESMTP id C02E79DB; Wed, 21 Oct 2015 00:12:55 -0700 (PDT) Received: from IN01WEHTCB.internal.synopsys.com (10.144.199.106) by US01WEHTC2.internal.synopsys.com (10.12.239.237) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 21 Oct 2015 00:12:55 -0700 Received: from IN01WEHTCA.internal.synopsys.com (10.144.199.103) by IN01WEHTCB.internal.synopsys.com (10.144.199.105) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 21 Oct 2015 12:42:52 +0530 Received: from vineetg-E7440.internal.synopsys.com (10.12.197.182) by IN01WEHTCA.internal.synopsys.com (10.144.199.243) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 21 Oct 2015 12:42:51 +0530 From: Vineet Gupta To: , Subject: [PATCH 2/3] NPTL/ARC: fix __lll_lock_wait_private redefinition for static links Date: Wed, 21 Oct 2015 12:42:24 +0530 Message-ID: <1445411545-14538-3-git-send-email-vgupta@synopsys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445411545-14538-1-git-send-email-vgupta@synopsys.com> References: <1445411545-14538-1-git-send-email-vgupta@synopsys.com> MIME-Version: 1.0 X-Originating-IP: [10.12.197.182] Cc: Vineet Gupta X-BeenThere: uclibc@uclibc.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "Discussion and development of uClibc \(the embedded C library\)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: uclibc-bounces@uclibc.org Sender: "uClibc" Commit 2d9740a65a "uclibc: nptl: fix __lll_lock_wait_private multiple definition" did a sweeping change which did for all in tree arches at that time (ARC wasn't) Signed-off-by: Vineet Gupta --- libpthread/nptl/sysdeps/unix/sysv/linux/arc/lowlevellock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/lowlevellock.c index 1aa79609a713..fd39fe907444 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/lowlevellock.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/lowlevellock.c @@ -24,8 +24,10 @@ #include #include - void +#ifndef IS_IN_libpthread +weak_function +#endif __lll_lock_wait_private (int *futex) { if (*futex == 2)