aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-06-12 14:33:59 -0700
committerRoland McGrath <roland@hack.frob.com>2014-06-12 14:33:59 -0700
commite26822463f4c36746a25b9b25552c43c350862b8 (patch)
treebfe55df502169587c0c84391bbfefe15fc2ac2b6 /nptl
parentb0725f43245ce50cfafa7de41bb7aeb8e4c4cb00 (diff)
downloadglibc-e26822463f4c36746a25b9b25552c43c350862b8.zip
glibc-e26822463f4c36746a25b9b25552c43c350862b8.tar.gz
glibc-e26822463f4c36746a25b9b25552c43c350862b8.tar.bz2
Move SPARC code out of nptl/sysdeps/sparc/.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/sysdeps/sparc/Makefile8
-rw-r--r--nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S32
-rw-r--r--nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S29
-rw-r--r--nptl/sysdeps/sparc/sparc32/pthreaddef.h33
-rw-r--r--nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c1
-rw-r--r--nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S1
-rw-r--r--nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S1
-rw-r--r--nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S1
-rw-r--r--nptl/sysdeps/sparc/sparc64/pthread_spin_init.c1
-rw-r--r--nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S31
-rw-r--r--nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S27
-rw-r--r--nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S28
-rw-r--r--nptl/sysdeps/sparc/sparc64/pthreaddef.h33
-rw-r--r--nptl/sysdeps/sparc/tcb-offsets.sym7
-rw-r--r--nptl/sysdeps/sparc/tls.h178
15 files changed, 0 insertions, 411 deletions
diff --git a/nptl/sysdeps/sparc/Makefile b/nptl/sysdeps/sparc/Makefile
deleted file mode 100644
index 5372867..0000000
--- a/nptl/sysdeps/sparc/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-ifeq ($(subdir),csu)
-gen-as-const-headers += tcb-offsets.sym
-endif
-
-ifeq ($(subdir),nptl)
-CPPFLAGS-pt-crti.S += -fPIC
-CPPFLAGS-crtn.S += -fPIC
-endif
diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
deleted file mode 100644
index 3accc69..0000000
--- a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2012-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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 <sysdep.h>
-
- .text
-ENTRY(pthread_spin_lock)
-1: ldstub [%o0], %g1
- orcc %g1, 0x0, %g0
- bne,a 2f
- ldub [%o0], %g1
- retl
- mov 0, %o0
-2: orcc %g1, 0x0, %g0
- bne,a 2b
- ldub [%o0], %g1
- ba,a 1b
-END(pthread_spin_lock)
diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S b/nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S
deleted file mode 100644
index 68215ab..0000000
--- a/nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2012-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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 <sysdep.h>
-#include <pthread-errnos.h>
-
- .text
-ENTRY(pthread_spin_trylock)
- ldstub [%o0], %o0
- cmp %o0, 0
- bne,a 1f
- mov EBUSY, %o0
-1: retl
- nop
-END(pthread_spin_trylock)
diff --git a/nptl/sysdeps/sparc/sparc32/pthreaddef.h b/nptl/sysdeps/sparc/sparc32/pthreaddef.h
deleted file mode 100644
index eb8d33b..0000000
--- a/nptl/sysdeps/sparc/sparc32/pthreaddef.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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/>. */
-
-/* Default stack size. */
-#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024)
-
-/* Required stack pointer alignment at beginning. */
-#define STACK_ALIGN 16
-
-/* Minimal stack size after allocating thread descriptor and guard size. */
-#define MINIMAL_REST_STACK 2048
-
-/* Alignment requirement for TCB. */
-#define TCB_ALIGNMENT 16
-
-
-/* Location of current stack frame. */
-#define CURRENT_STACK_FRAME (stack_pointer + (2 * 64))
-register char *stack_pointer __asm__("%sp");
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c
deleted file mode 100644
index d27e550..0000000
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sparc64/pthread_spin_init.c>
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
deleted file mode 100644
index d33b375..0000000
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sparc64/pthread_spin_lock.S>
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S
deleted file mode 100644
index af5b151..0000000
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sparc64/pthread_spin_trylock.S>
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S
deleted file mode 100644
index c40d80f..0000000
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sparc64/pthread_spin_unlock.S>
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c b/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c
deleted file mode 100644
index 58319ab..0000000
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c
+++ /dev/null
@@ -1 +0,0 @@
-/* pthread_spin_init is in pthread_spin_unlock.S */
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
deleted file mode 100644
index aec6654..0000000
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2012-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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 <sysdep.h>
-
- .text
-ENTRY(pthread_spin_lock)
-1: ldstub [%o0], %g1
- brnz,pn %g1, 2f
- membar #StoreLoad | #StoreStore
- retl
- mov 0, %o0
-2: ldub [%o0], %g1
- brnz,pt %g1, 2b
- membar #LoadLoad
- ba,a,pt %xcc, 1b
-END(pthread_spin_lock)
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S
deleted file mode 100644
index d10b08b..0000000
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2012-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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 <sysdep.h>
-#include <pthread-errnos.h>
-
- .text
-ENTRY(pthread_spin_trylock)
- ldstub [%o0], %o0
- membar #StoreLoad | #StoreStore
- retl
- movrnz %o0, EBUSY, %o0
-END(pthread_spin_trylock)
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
deleted file mode 100644
index 0c18530..0000000
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 2012-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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 <sysdep.h>
-
- .text
-ENTRY(pthread_spin_unlock)
- membar #StoreStore | #LoadStore
- stb %g0, [%o0]
- retl
- clr %o0
-END(pthread_spin_unlock)
-
-strong_alias (pthread_spin_unlock, pthread_spin_init)
diff --git a/nptl/sysdeps/sparc/sparc64/pthreaddef.h b/nptl/sysdeps/sparc/sparc64/pthreaddef.h
deleted file mode 100644
index ee44bcf..0000000
--- a/nptl/sysdeps/sparc/sparc64/pthreaddef.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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/>. */
-
-/* Default stack size. */
-#define ARCH_STACK_DEFAULT_SIZE (4 * 1024 * 1024)
-
-/* Required stack pointer alignment at beginning. */
-#define STACK_ALIGN 16
-
-/* Minimal stack size after allocating thread descriptor and guard size. */
-#define MINIMAL_REST_STACK 4096
-
-/* Alignment requirement for TCB. */
-#define TCB_ALIGNMENT 16
-
-
-/* Location of current stack frame. */
-#define CURRENT_STACK_FRAME (stack_pointer + (2 * 128))
-register char *stack_pointer __asm__("%sp");
diff --git a/nptl/sysdeps/sparc/tcb-offsets.sym b/nptl/sysdeps/sparc/tcb-offsets.sym
deleted file mode 100644
index 923af8a..0000000
--- a/nptl/sysdeps/sparc/tcb-offsets.sym
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sysdep.h>
-#include <tls.h>
-
-MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads)
-POINTER_GUARD offsetof (tcbhead_t, pointer_guard)
-PID offsetof (struct pthread, pid)
-TID offsetof (struct pthread, tid)
diff --git a/nptl/sysdeps/sparc/tls.h b/nptl/sysdeps/sparc/tls.h
deleted file mode 100644
index 5ea9355..0000000
--- a/nptl/sysdeps/sparc/tls.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Definitions for thread-local data handling. NPTL/sparc version.
- Copyright (C) 2003-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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/>. */
-
-#ifndef _TLS_H
-#define _TLS_H
-
-#include <dl-sysdep.h>
-#ifndef __ASSEMBLER__
-# include <stdbool.h>
-# include <stddef.h>
-# include <stdint.h>
-# include <stdlib.h>
-# include <list.h>
-# include <kernel-features.h>
-
-/* Type for the dtv. */
-typedef union dtv
-{
- size_t counter;
- struct
- {
- void *val;
- bool is_static;
- } pointer;
-} dtv_t;
-
-typedef struct
-{
- void *tcb; /* Pointer to the TCB. Not necessary the
- thread descriptor used by libpthread. */
- dtv_t *dtv;
- void *self;
- int multiple_threads;
-#if __WORDSIZE == 64
- int gscope_flag;
-#endif
- uintptr_t sysinfo;
- uintptr_t stack_guard;
- uintptr_t pointer_guard;
-#if __WORDSIZE != 64
- int gscope_flag;
-#endif
-#ifndef __ASSUME_PRIVATE_FUTEX
- int private_futex;
-#endif
-} tcbhead_t;
-
-#else /* __ASSEMBLER__ */
-# include <tcb-offsets.h>
-#endif /* __ASSEMBLER__ */
-
-
-#ifndef __ASSEMBLER__
-/* Get system call information. */
-# include <sysdep.h>
-
-register struct pthread *__thread_self __asm__("%g7");
-
-/* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t),
- because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole
- struct pthread even when not linked with -lpthread. */
-# define TLS_INIT_TCB_SIZE sizeof (struct pthread)
-
-/* Alignment requirements for the initial TCB. */
-# define TLS_INIT_TCB_ALIGN __alignof__ (struct pthread)
-
-/* This is the size of the TCB. */
-# define TLS_TCB_SIZE sizeof (struct pthread)
-
-/* Alignment requirements for the TCB. */
-# define TLS_TCB_ALIGN __alignof__ (struct pthread)
-
-/* The TCB can have any size and the memory following the address the
- thread pointer points to is unspecified. Allocate the TCB there. */
-# define TLS_TCB_AT_TP 1
-# define TLS_DTV_AT_TP 0
-
-/* Get the thread descriptor definition. */
-# include <nptl/descr.h>
-
-/* Install the dtv pointer. The pointer passed is to the element with
- index -1 which contain the length. */
-# define INSTALL_DTV(descr, dtvp) \
- ((tcbhead_t *) (descr))->dtv = (dtvp) + 1
-
-/* Install new dtv for current thread. */
-# define INSTALL_NEW_DTV(DTV) \
- (((tcbhead_t *) __thread_self)->dtv = (DTV))
-
-/* Return dtv of given thread descriptor. */
-# define GET_DTV(descr) \
- (((tcbhead_t *) (descr))->dtv)
-
-/* Code to initially initialize the thread pointer. */
-# define TLS_INIT_TP(descr) \
- (__thread_self = (__typeof (__thread_self)) (descr), NULL)
-
-/* Value passed to 'clone' for initialization of the thread register. */
-# define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd)
-
-/* Return the address of the dtv for the current thread. */
-# define THREAD_DTV() \
- (((tcbhead_t *) __thread_self)->dtv)
-
-/* Return the thread descriptor for the current thread. */
-#define THREAD_SELF __thread_self
-
-/* Magic for libthread_db to know how to do THREAD_SELF. */
-# define DB_THREAD_SELF \
- REGISTER (32, 32, 10 * 4, 0) \
- REGISTER (64, __WORDSIZE, (6 * 8) + (__WORDSIZE==64?0:4), 0)
-
-/* Access to data in the thread descriptor is easy. */
-#define THREAD_GETMEM(descr, member) \
- descr->member
-#define THREAD_GETMEM_NC(descr, member, idx) \
- descr->member[idx]
-#define THREAD_SETMEM(descr, member, value) \
- descr->member = (value)
-#define THREAD_SETMEM_NC(descr, member, idx, value) \
- descr->member[idx] = (value)
-
-/* Set the stack guard field in TCB head. */
-#define THREAD_SET_STACK_GUARD(value) \
- THREAD_SETMEM (THREAD_SELF, header.stack_guard, value)
-# define THREAD_COPY_STACK_GUARD(descr) \
- ((descr)->header.stack_guard \
- = THREAD_GETMEM (THREAD_SELF, header.stack_guard))
-
-/* Get/set the stack guard field in TCB head. */
-#define THREAD_GET_POINTER_GUARD() \
- THREAD_GETMEM (THREAD_SELF, header.pointer_guard)
-#define THREAD_SET_POINTER_GUARD(value) \
- THREAD_SETMEM (THREAD_SELF, header.pointer_guard, value)
-# define THREAD_COPY_POINTER_GUARD(descr) \
- ((descr)->header.pointer_guard = THREAD_GET_POINTER_GUARD ())
-
-/* Get and set the global scope generation counter in struct pthread. */
-#define THREAD_GSCOPE_FLAG_UNUSED 0
-#define THREAD_GSCOPE_FLAG_USED 1
-#define THREAD_GSCOPE_FLAG_WAIT 2
-#define THREAD_GSCOPE_RESET_FLAG() \
- do \
- { int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
- THREAD_GSCOPE_FLAG_UNUSED); \
- if (__res == THREAD_GSCOPE_FLAG_WAIT) \
- lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
- } \
- while (0)
-#define THREAD_GSCOPE_SET_FLAG() \
- do \
- { \
- THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
- atomic_write_barrier (); \
- } \
- while (0)
-#define THREAD_GSCOPE_WAIT() \
- GL(dl_wait_lookup_done) ()
-
-#endif /* !ASSEMBLER */
-
-#endif /* tls.h */