From f12b48148690e7769ab485aa4097c932f67f33dd Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 11 Jun 2014 12:23:17 -0700 Subject: [PATCH] PowerPC: Define TLS_DEFINE_INIT_TP --- ChangeLog | 3 +++ nptl/sysdeps/powerpc/tls.h | 4 ++++ .../unix/sysv/linux/powerpc/createthread.c | 24 ------------------- 3 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/powerpc/createthread.c diff --git a/ChangeLog b/ChangeLog index a7fd040fc0..0554f83daa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-06-11 Roland McGrath + * nptl/sysdeps/powerpc/tls.h (TLS_DEFINE_INIT_TP): New macro. + * sysdeps/unix/sysv/linux/powerpc/createthread.c: File removed. + * sysdeps/aarch64/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro. * sysdeps/unix/sysv/linux/aarch64/nptl/createthread.c: File removed. diff --git a/nptl/sysdeps/powerpc/tls.h b/nptl/sysdeps/powerpc/tls.h index 91cc6f3f44..b80a5fbf54 100644 --- a/nptl/sysdeps/powerpc/tls.h +++ b/nptl/sysdeps/powerpc/tls.h @@ -132,6 +132,10 @@ register void *__thread_register __asm__ ("r13"); # define TLS_INIT_TP(tcbp) \ (__thread_register = (void *) (tcbp) + TLS_TCB_OFFSET, 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 *) (__thread_register - TLS_TCB_OFFSET))[-1].dtv) diff --git a/sysdeps/unix/sysv/linux/powerpc/createthread.c b/sysdeps/unix/sysv/linux/powerpc/createthread.c deleted file mode 100644 index 453b1d96ce..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/createthread.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (C) 2003-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Paul Mackerras . - - 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.43.5