m68k: Define TLS_DEFINE_INIT_TP

diff --git a/ChangeLog b/ChangeLog
index 75a72cd..249e78b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-09  Roland McGrath  <roland@hack.frob.com>
 
+       * sysdeps/m68k/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro.
+       * sysdeps/unix/sysv/linux/m68k/nptl/createthread.c: File removed.
+
        * sysdeps/hppa/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro.
        * sysdeps/unix/sysv/linux/hppa/nptl/createthread.c: File removed.
 

diff --git a/sysdeps/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h
index c1df875..aa925d4 100644 (file)
--- a/sysdeps/m68k/nptl/tls.h
+++ b/sysdeps/m68k/nptl/tls.h
@@ -112,6 +112,9 @@ typedef struct
                                    ((void *) (tcbp)) + TLS_TCB_OFFSET); \
     INTERNAL_SYSCALL_ERROR_P (_sys_result, err) ? "unknown error" : NULL; })
 
+# define TLS_DEFINE_INIT_TP(tp, pd) \
+  void *tp = (void *) (pd) + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE
+
 extern void * __m68k_read_tp (void);
 
 /* Return the address of the dtv for the current thread.  */

diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c b/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c
deleted file mode 100644 (file)
index f0508a1..0000000
--- a/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 2010-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-
-   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 ((void *) (pd) \
-                  + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE)
-
-/* Get the real implementation.         */
-#include <nptl/sysdeps/pthread/createthread.c>