system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: Split Linuxism out of sysdeps/arm/nptl/tls.h

Browse Source
This commit is contained in:
Roland McGrath 2014-06-30 11:19:22 -07:00
parent ce9c5b3e95
commit 46f1d8a6b5
3 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2014-06-30 Roland McGrath <roland@hack.frob.com>
* 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 <sysdep.h>, to ...
* sysdeps/unix/sysv/linux/arm/tls.h: ... this new file.
2014-06-30 Joseph Myers <joseph@codesourcery.com>
[BZ #16539]

17
sysdeps/arm/nptl/tls.h
View File

@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#ifndef _TLS_H
#define _TLS_H 1
#ifndef _ARM_NPTL_TLS_H
#define _ARM_NPTL_TLS_H 1
#include <dl-sysdep.h>
@ -44,9 +44,6 @@ typedef union dtv
#ifndef __ASSEMBLER__
/* Get system call information. */
# include <sysdep.h>
/* 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. */

42
sysdeps/unix/sysv/linux/arm/tls.h Normal file
View File

@ -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
<http://www.gnu.org/licenses/>. */
#ifndef _LINUX_ARM_TLS_H
#define _LINUX_ARM_TLS_H 1
/* Almost everything is OS-independent and common for all NPTL on ARM. */
#include <sysdeps/arm/nptl/tls.h>
#ifndef __ASSEMBLER__
/* Get system call information. */
# include <sysdep.h>
/* 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 */