about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/arm/nptl/tls.h2
-rw-r--r--sysdeps/unix/sysv/linux/arm/createthread.c22
3 files changed, 5 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index bd1377164d..da5a7ec50b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-09  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/arm/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro.
+	* sysdeps/unix/sysv/linux/arm/createthread.c: File removed.
+
 	* nptl/sysdeps/pthread/createthread.c (TLS_DEFINE_INIT_TP): New macro,
 	if not already defined.
 	(do_clone): Use that in place of PREPARE_CREATE and TLS_VALUE.
diff --git a/sysdeps/arm/nptl/tls.h b/sysdeps/arm/nptl/tls.h
index fc828d2e7f..6521bdce0e 100644
--- a/sysdeps/arm/nptl/tls.h
+++ b/sysdeps/arm/nptl/tls.h
@@ -98,6 +98,8 @@ typedef struct
      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.  */
 # define THREAD_DTV() \
   (((tcbhead_t *) __builtin_thread_pointer ())->dtv)
diff --git a/sysdeps/unix/sysv/linux/arm/createthread.c b/sysdeps/unix/sysv/linux/arm/createthread.c
deleted file mode 100644
index 5e96513ca8..0000000000
--- a/sysdeps/unix/sysv/linux/arm/createthread.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 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/>.  */
-
-/* Value passed to 'clone' for initialization of the thread register.  */
-#define TLS_VALUE (pd + 1)
-
-/* Get the real implementation.	 */
-#include <nptl/sysdeps/pthread/createthread.c>