From patchwork Fri Jun 27 22:34:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 1809 Received: (qmail 16331 invoked by alias); 27 Jun 2014 22:34:57 -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 16319 invoked by uid 89); 27 Jun 2014 22:34:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 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: [PATCH roland/arm-tls] ARM: Split Linuxism out of sysdeps/arm/nptl/tls.h Message-Id: <20140627223451.A77242C39F0@topped-with-meat.com> Date: Fri, 27 Jun 2014 15:34:51 -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=UVwJD6M6c8oA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8 a=xopsvee01cna76iZfvsA:9 a=CjuIK1q_8ugA:10 This makes the main ARM-specific file OS-independent. Verified no code changes on arm-linux-gnueabihf. OK? Thanks, Roland 2014-06-27 Roland McGrath * sysdeps/arm/nptl/tls.h: Rename the multiple inclusion guard from _TLS_H to _ARM_NPTL_TLS_H. (TLS_INIT_TP): Move macro, and #include of , to ... * sysdeps/unix/sysv/linux/arm/tls.h: ... this new file. --- a/sysdeps/arm/nptl/tls.h +++ b/sysdeps/arm/nptl/tls.h @@ -16,8 +16,8 @@ License along with the GNU C Library. If not, see . */ -#ifndef _TLS_H -#define _TLS_H 1 +#ifndef _ARM_NPTL_TLS_H +#define _ARM_NPTL_TLS_H 1 #include @@ -44,9 +44,6 @@ typedef union dtv #ifndef __ASSEMBLER__ -/* Get system call information. */ -# include - /* The TP points to the start of the thread blocks. */ # define TLS_DTV_AT_TP 1 # define TLS_TCB_AT_TP 0 @@ -88,16 +85,6 @@ typedef struct # define GET_DTV(tcbp) \ (((tcbhead_t *) (tcbp))->dtv) -/* Code to initially initialize the thread pointer. This might need - special attention since 'errno' is not yet available and if the - operation can cause a failure 'errno' must not be touched. */ -# define TLS_INIT_TP(tcbp) \ - ({ INTERNAL_SYSCALL_DECL (err); \ - long result_var; \ - result_var = INTERNAL_SYSCALL_ARM (set_tls, err, 1, (tcbp)); \ - INTERNAL_SYSCALL_ERROR_P (result_var, err) \ - ? "unknown error" : NULL; }) - # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1 /* Return the address of the dtv for the current thread. */ --- /dev/null +++ b/sysdeps/unix/sysv/linux/arm/tls.h @@ -0,0 +1,42 @@ +/* Definition for thread-local data handling. ARM/Linux version. + 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 + . */ + +#ifndef _LINUX_ARM_TLS_H +#define _LINUX_ARM_TLS_H 1 + +/* Almost everything is OS-independent and common for all NPTL on ARM. */ +#include + +#ifndef __ASSEMBLER__ + +/* Get system call information. */ +# include + +/* Code to initially initialize the thread pointer. This might need + special attention since 'errno' is not yet available and if the + operation can cause a failure 'errno' must not be touched. */ +# define TLS_INIT_TP(tcbp) \ + ({ INTERNAL_SYSCALL_DECL (err); \ + long int result_var; \ + result_var = INTERNAL_SYSCALL_ARM (set_tls, err, 1, (tcbp)); \ + INTERNAL_SYSCALL_ERROR_P (result_var, err) \ + ? "unknown error" : NULL; }) + +#endif /* __ASSEMBLER__ */ + +#endif /* tls.h */