This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/arm-tls created. glibc-2.19-713-g07a4999
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jun 2014 22:33:46 -0000
- Subject: GNU C Library master sources branch roland/arm-tls created. glibc-2.19-713-g07a4999
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/arm-tls has been created
at 07a49995f3bb14f1be2adc9e62136c5941fefd77 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=07a49995f3bb14f1be2adc9e62136c5941fefd77
commit 07a49995f3bb14f1be2adc9e62136c5941fefd77
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Jun 27 15:21:47 2014 -0700
ARM: Split Linuxism out of sysdeps/arm/nptl/tls.h
diff --git a/ChangeLog b/ChangeLog
index 3582966..57703d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-27 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-27 Joseph Myers <joseph@codesourcery.com>
* Makeconfig ($(common-objpfx)soversions.mk): Do not generate
diff --git a/sysdeps/arm/nptl/tls.h b/sysdeps/arm/nptl/tls.h
index 6521bdc..95b6a20 100644
--- 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
<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. */
diff --git a/sysdeps/unix/sysv/linux/arm/tls.h b/sysdeps/unix/sysv/linux/arm/tls.h
new file mode 100644
index 0000000..bfb76b3
--- /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
+ <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 */
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources