From patchwork Thu Sep 15 19:34:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 670555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sZpX56N0dz9sC3 for ; Fri, 16 Sep 2016 05:34:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=gl9F3P79; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=ZQ6QgeulMGoifR+K94LHf8lBMTXyw5CKAP0uo9B+hKIg1rU8kAqTP 1+eJlIQNs0G6aaK+UFl0ZrMITEbbzbP+JMpv0trGKNjohTDqjsB9elpt64j5rmET J8bwUxVFsZi1iUJvDHaBK41VjPK5wqPpfEz8BfNYnb/Cgd5S97Q6EA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=Krg7lDG+RoV8Ob865X6nQ3n2Ies=; b=gl9F3P79ET3OwaSOOELH2yoVKZyl LofMr0/rvM0LgDgU8m58nKyUF0MLryQDhFnx8lfztTcxP1VNoagjTsz9k3xaBq6l PJ5jYebt3z/F1mveVhphnpS1VDo68n3IUwbcuqV0lW57/aRyqxQWCI/c9+MKH0pT A5rDFHQoIrTHTZU= Received: (qmail 33574 invoked by alias); 15 Sep 2016 19:34:38 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 31852 invoked by uid 89); 15 Sep 2016 19:34:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.2 required=5.0 tests=BAYES_20, RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=drepper, sparcv9, sk:drepper, U*drepper X-HELO: mail-yb0-f171.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=6elL9P8BDnBXTlMDkbRpLSn5gQ9trryxh4IlsCYBJp4=; b=mb7FKtPNWMe8l83XjEeQNZhmHjaxa9wgI3eK3NaCyzeEPLAyDmGRmJa62XhrArcUVw N5hLayB4JpuYd3IlzA+yDHjLlBSdoDRW+ZKOhslhg7e4HDaUei4oevHrLLD0PeizlgDO /KM74RJi1x9Q9GmPZXsDMYubruh4uDgYvLrJcyuaRSQNZjAPOwtlf2MHQmEMWaoqHTkZ Du8pfJodZkDmRjVdzq6Kn0vPE8/wgvboSOHu4P2tFFiyPATh2mW33JWw66fS1klgSCJ+ EcRu2X15O+RoLEAqB+l+AaW7vtDLErVKQOjqa1l1zcQ/YT0vwCUHY0ythVhV3V4NuN2x KAVg== X-Gm-Message-State: AE9vXwMs5xEwka9boyAf4GMS8WAi8fq5imkxL7Nl3Cj0PBkX09uxkOHfqrldESrI+SW1HKZT X-Received: by 10.37.68.132 with SMTP id r126mr7045964yba.164.1473968065116; Thu, 15 Sep 2016 12:34:25 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] nptl: Consolidate sem_init implementations Date: Thu, 15 Sep 2016 16:34:19 -0300 Message-Id: <1473968059-31682-1-git-send-email-adhemerval.zanella@linaro.org> Current sparc32 sem_init and default one only differ on sem.newsem.pad initialization. This patch removes sparc32 and sparc32v9 sem_init arch specific implementation and set sparc32 to use nptl default one. The default implementation sets the required sem.newsem.pad to 0 (which is ununsed in other architectures). I checked on i686 and a sparc32v9 build. * nptl/sem_init.c (sem_init): Init pad value to 0. * sysdeps/sparc/sparc32/sem_init.c: Remove file. * sysdeps/sparc/sparc32/sparcv9/sem_init.c: Likewise. --- nptl/sem_init.c | 2 + sysdeps/sparc/sparc32/sem_init.c | 85 -------------------------------- sysdeps/sparc/sparc32/sparcv9/sem_init.c | 1 - 4 files changed, 8 insertions(+), 86 deletions(-) delete mode 100644 sysdeps/sparc/sparc32/sem_init.c delete mode 100644 sysdeps/sparc/sparc32/sparcv9/sem_init.c diff --git a/nptl/sem_init.c b/nptl/sem_init.c index be0f27d..9380a21 100644 --- a/nptl/sem_init.c +++ b/nptl/sem_init.c @@ -49,6 +49,8 @@ __new_sem_init (sem_t *sem, int pshared, unsigned int value) isem->data = value; #else isem->value = value << SEM_VALUE_SHIFT; + /* pad is used as a mutex on pre-v9 sparc and ignored otherwise. */ + isem->pad = 0; isem->nwaiters = 0; #endif diff --git a/sysdeps/sparc/sparc32/sem_init.c b/sysdeps/sparc/sparc32/sem_init.c deleted file mode 100644 index ae49ec5..0000000 --- a/sysdeps/sparc/sparc32/sem_init.c +++ /dev/null @@ -1,85 +0,0 @@ -/* Copyright (C) 2002-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2002. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include "semaphoreP.h" -#include - - -int -__new_sem_init (sem_t *sem, int pshared, unsigned int value) -{ - /* Parameter sanity check. */ - if (__glibc_unlikely (value > SEM_VALUE_MAX)) - { - __set_errno (EINVAL); - return -1; - } - - pshared = pshared != 0 ? PTHREAD_PROCESS_SHARED : PTHREAD_PROCESS_PRIVATE; - int err = futex_supports_pshared (pshared); - if (err != 0) - { - __set_errno (err); - return -1; - } - - /* Map to the internal type. */ - struct new_sem *isem = (struct new_sem *) sem; - - /* Use the values the caller provided. */ - isem->value = value << SEM_VALUE_SHIFT; - isem->pad = 0; - isem->nwaiters = 0; - - isem->private = (pshared == PTHREAD_PROCESS_PRIVATE - ? FUTEX_PRIVATE : FUTEX_SHARED); - - return 0; -} -versioned_symbol (libpthread, __new_sem_init, sem_init, GLIBC_2_1); - - - -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) -int -attribute_compat_text_section -__old_sem_init (sem_t *sem, int pshared, unsigned int value) -{ - /* Parameter sanity check. */ - if (__glibc_unlikely (value > SEM_VALUE_MAX)) - { - __set_errno (EINVAL); - return -1; - } - - /* Map to the internal type. */ - struct old_sem *isem = (struct old_sem *) sem; - - /* Use the value the user provided. */ - isem->value = value; - - /* We cannot store the PSHARED attribute. So we always use the - operations needed for shared semaphores. */ - - return 0; -} -compat_symbol (libpthread, __old_sem_init, sem_init, GLIBC_2_0); -#endif diff --git a/sysdeps/sparc/sparc32/sparcv9/sem_init.c b/sysdeps/sparc/sparc32/sparcv9/sem_init.c deleted file mode 100644 index c90d1b5..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/sem_init.c +++ /dev/null @@ -1 +0,0 @@ -#include