From patchwork Mon Jun 9 20:29:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 1397 Received: (qmail 25516 invoked by alias); 9 Jun 2014 20:29:59 -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 25507 invoked by uid 89); 9 Jun 2014 20:29:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: Re: [PATCH roland/tls-init] IA64: Define TLS_DEFINE_INIT_TP Message-Id: <20140609202955.DAD9B2C39A8@topped-with-meat.com> Date: Mon, 9 Jun 2014 13:29:55 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=hKq3sRt-6p8A:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=20KFwNOVAAAA:8 a=mDV3o1hIAAAA:8 a=Sg9KzqQakvFpeB4Rw_wA:9 a=CjuIK1q_8ugA:10 a=jEp0ucaQiEUA:10 Not tested at all, but this should not change anything. OK? Thanks, Roland * nptl/sysdeps/pthread/createthread.c: Include . * sysdeps/unix/sysv/linux/ia64/arch-fork.h (ARCH_CLONE): New macro. * sysdeps/ia64/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro. * sysdeps/unix/sysv/linux/ia64/nptl/createthread.c: File removed. --- a/nptl/sysdeps/pthread/createthread.c +++ b/nptl/sysdeps/pthread/createthread.c @@ -25,6 +25,7 @@ #include #include +#include #include "kernel-features.h" --- a/sysdeps/ia64/nptl/tls.h +++ b/sysdeps/ia64/nptl/tls.h @@ -121,6 +121,10 @@ register struct pthread *__thread_self __asm__("r13"); # define TLS_INIT_TP(thrdescr) \ (__thread_self = (thrdescr), INIT_SYSINFO, NULL) +/* Value passed to 'clone2' for initialization of the thread register. */ +# define TLS_DEFINE_INIT_TP(tp, pd) \ + void *tp = (char *) (pd) + TLS_PRE_TCB_SIZE + /* Return the address of the dtv for the current thread. */ # define THREAD_DTV() \ (((tcbhead_t *)__thread_self)->dtv) --- a/sysdeps/unix/sysv/linux/ia64/arch-fork.h +++ b/sysdeps/unix/sysv/linux/ia64/arch-fork.h @@ -27,3 +27,5 @@ INLINE_SYSCALL (clone2, 6, \ CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, \ NULL, 0, NULL, &THREAD_SELF->tid, NULL) + +#define ARCH_CLONE __clone2 --- a/sysdeps/unix/sysv/linux/ia64/nptl/createthread.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (C) 2003-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek . - - 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 ((char *) pd + TLS_PRE_TCB_SIZE) - -#define ARCH_CLONE __clone2 - -/* Get the real implementation. */ -#include