From 50f0a637b729f0b8ecf4f299ae3a6b33eb9c9cb7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 9 Jun 2014 13:47:38 -0700 Subject: [PATCH] MIPS: Define TLS_DEFINE_INIT_TP --- ChangeLog | 3 +++ sysdeps/mips/nptl/tls.h | 4 ++++ sysdeps/unix/sysv/linux/mips/nptl/createthread.c | 23 ----------------------- 3 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/mips/nptl/createthread.c diff --git a/ChangeLog b/ChangeLog index da5a7ec50b..10439cb050 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-06-09 Roland McGrath + * sysdeps/mips/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro. + * sysdeps/unix/sysv/linux/mips/nptl/createthread.c: File removed. + * sysdeps/arm/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro. * sysdeps/unix/sysv/linux/arm/createthread.c: File removed. diff --git a/sysdeps/mips/nptl/tls.h b/sysdeps/mips/nptl/tls.h index d6fd83d31c..cb1cb4e31f 100644 --- a/sysdeps/mips/nptl/tls.h +++ b/sysdeps/mips/nptl/tls.h @@ -126,6 +126,10 @@ typedef struct INTERNAL_SYSCALL_ERROR_P (result_var, err) \ ? "unknown error" : NULL; }) +/* Value passed to 'clone' for initialization of the thread register. */ +# define TLS_DEFINE_INIT_TP(tp, pd) \ + void *tp = (void *) (pd) + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE + /* Return the address of the dtv for the current thread. */ # define THREAD_DTV() \ (((tcbhead_t *) (READ_THREAD_POINTER () - TLS_TCB_OFFSET))[-1].dtv) diff --git a/sysdeps/unix/sysv/linux/mips/nptl/createthread.c b/sysdeps/unix/sysv/linux/mips/nptl/createthread.c deleted file mode 100644 index bcc6502537..0000000000 --- a/sysdeps/unix/sysv/linux/mips/nptl/createthread.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (C) 2005-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 - . */ - -/* Value passed to 'clone' for initialization of the thread register. */ -#define TLS_VALUE ((void *) (pd) \ - + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE) - -/* Get the real implementation. */ -#include -- 2.11.4.GIT