about summary refs log tree commit diff
path: root/sysdeps/sparc
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-09-15 11:21:52 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-09-15 16:31:50 -0300
commit09cb278539d6ebb30a4de89a6bfd8bda1b085c07 (patch)
treeb3380b0de0a9eed5c55792a6057515fd368d3582 /sysdeps/sparc
parentfbc994921b459d57b681a926780933a20745edf5 (diff)
downloadglibc-09cb278539d6ebb30a4de89a6bfd8bda1b085c07.tar.gz
glibc-09cb278539d6ebb30a4de89a6bfd8bda1b085c07.tar.xz
glibc-09cb278539d6ebb30a4de89a6bfd8bda1b085c07.zip
nptl: Consolidate sem_init implementations
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.
Diffstat (limited to 'sysdeps/sparc')
-rw-r--r--sysdeps/sparc/sparc32/sem_init.c85
-rw-r--r--sysdeps/sparc/sparc32/sparcv9/sem_init.c1
2 files changed, 0 insertions, 86 deletions
diff --git a/sysdeps/sparc/sparc32/sem_init.c b/sysdeps/sparc/sparc32/sem_init.c
deleted file mode 100644
index ae49ec573b..0000000000
--- 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 <drepper@redhat.com>, 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
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <semaphore.h>
-#include <shlib-compat.h>
-#include "semaphoreP.h"
-#include <futex-internal.h>
-
-
-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 c90d1b599a..0000000000
--- a/sysdeps/sparc/sparc32/sparcv9/sem_init.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <nptl/sem_init.c>